diff --git a/.circleci/config.yml b/.circleci/config.yml index 7eeffd59..36b923a9 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: usdotfhwastolcandidate/carma-base:k900 + - image: usdotfhwastol/carma-base:carma-system-4.4.0 user: carma environment: TERM: xterm diff --git a/Dockerfile b/Dockerfile index f88ff26e..b17ec1da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations under # the License. -FROM usdotfhwastolcandidate/carma-base:k900 as base +FROM usdotfhwastol/carma-base:carma-system-4.4.0 as base FROM base as setup ARG ROS1_PACKAGES="" diff --git a/docker/checkout.bash b/docker/checkout.bash index d335e2a8..7ed7ebdd 100755 --- a/docker/checkout.bash +++ b/docker/checkout.bash @@ -39,6 +39,6 @@ if [[ "$BRANCH" = "develop" ]]; then git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch $BRANCH --depth 1 git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch $BRANCH --depth 1 else - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch release/k900 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch release/k900 + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch carma-system-4.4.0 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch carma-system-4.4.0 fi