From 6fceccbf405e8393020b2df34e61fa4e83486a2c Mon Sep 17 00:00:00 2001 From: Michael McConnell Date: Mon, 11 Nov 2019 15:03:45 -0500 Subject: [PATCH] Update base docker image version to carma-base:3.3.0 --- .circleci/config.yml | 2 +- Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3dcf54b1..2ece8577 100644 --- 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 index ba23abb1..8a038922 100644 --- 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"