diff --git a/.circleci/config.yml b/.circleci/config.yml index f8fa15c8..2518f002 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.4.0 + - image: usdotfhwastol/carma-base:3.7.0 user: carma environment: TERM: xterm diff --git a/Dockerfile b/Dockerfile index 33028123..a4d6c030 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.4.0 as setup +FROM usdotfhwastol/carma-base:3.7.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.4.0 +FROM usdotfhwastol/carma-base:3.7.0 ARG BUILD_DATE="NULL" ARG VERSION="NULL"