Merge pull request #21 from usdot-fhwa-stol/feature/update_base_image…

…_version Update base docker image version to carma-base:3.3.0
usdot-fhwa-stol · Nov 13, 2019 · 49802a7 · 49802a7
2 parents 2afc418 + 6fceccb
commit 49802a7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -28,7 +28,7 @@ jobs:
     # Pull docker image from docker hub
     # XTERM used for better catkin_make output
     docker:
-      - image: usdotfhwastol/carma-base:3.2.0
+      - image: usdotfhwastol/carma-base:3.3.0
         user: carma
         environment:
           TERM: xterm

diff --git a/Dockerfile b/Dockerfile
@@ -12,14 +12,14 @@
 #  License for the specific language governing permissions and limitations under
 #  the License.
 
-FROM usdotfhwastol/carma-base:3.2.0 as setup
+FROM usdotfhwastol/carma-base:3.3.0 as setup
 
 RUN mkdir ~/src
 COPY --chown=carma . /home/carma/src/CARMAAvtVimbaDriver
 RUN ~/src/CARMAAvtVimbaDriver/docker/checkout.sh
 RUN ~/src/CARMAAvtVimbaDriver/docker/install.sh
 
-FROM usdotfhwastol/carma-base:3.2.0
+FROM usdotfhwastol/carma-base:3.3.0
 
 ARG BUILD_DATE="NULL"
 ARG VERSION="NULL"