diff --git a/.circleci/config.yml b/.circleci/config.yml index a69fd955191..32f1803fc70 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: usdotfhwastoldev/carma-base:develop + - image: usdotfhwastol/carma-base:carma-system-4.2.0 user: carma environment: TERM: xterm diff --git a/Dockerfile b/Dockerfile index b8994718edf..1d5d2758ba1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM usdotfhwastoldev/carma-base:develop AS base_image +FROM usdotfhwastol/carma-base:carma-system-4.2.0 AS base_image FROM base_image AS build diff --git a/docker/checkout.bash b/docker/checkout.bash index d0866d6a986..d29693f82aa 100755 --- a/docker/checkout.bash +++ b/docker/checkout.bash @@ -39,9 +39,9 @@ if [[ "$BRANCH" = "develop" ]]; then git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-utils.git --branch $BRANCH git clone --depth=1 https://github.com/usdot-fhwa-stol/autoware.auto.git --branch $BRANCH else - git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-msgs.git --branch develop - git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-utils.git --branch develop - git clone --depth=1 https://github.com/usdot-fhwa-stol/autoware.auto.git --branch develop + git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-msgs.git --branch carma-system-4.2.0 + git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-utils.git --branch carma-system-4.2.0 + git clone --depth=1 https://github.com/usdot-fhwa-stol/autoware.auto.git --branch carma-system-4.2.0 fi # Required to build pacmod_msgs