diff --git a/.circleci/config.yml b/.circleci/config.yml index 30a1c79..469a6c1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: build: # Setup docker docker: - - image: usdotfhwastol/carma-base:carma-system-4.4.0 + - image: usdotfhwastol/carma-base:carma-system-4.4.3 user: carma environment: TERM: xterm # use xterm to get full display output from build diff --git a/Dockerfile b/Dockerfile index cb2eadd..f3fa022 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM usdotfhwastol/carma-base:carma-system-4.4.0 as base_image +FROM usdotfhwastol/carma-base:carma-system-4.4.3 as base_image SHELL ["/bin/bash", "-c"] ARG DEBIAN_FRONTEND="noninteractive" diff --git a/docker/checkout.bash b/docker/checkout.bash index c3694a5..20c4a5d 100755 --- a/docker/checkout.bash +++ b/docker/checkout.bash @@ -42,9 +42,9 @@ cd ${dir}/src if [[ "$BRANCH" = "develop" ]]; then cd /home/carma/ - git clone https://github.com/usdot-fhwa-stol/autoware.ai.git --depth 1 --branch release/k900 + git clone https://github.com/usdot-fhwa-stol/autoware.ai.git --depth 1 --branch carma-develop cd ${dir}/src - git clone --depth 1 --branch carma-system-4.4.0 https://github.com/usdot-fhwa-stol/ros1_bridge.git + git clone --depth 1 --branch develop https://github.com/usdot-fhwa-stol/ros1_bridge.git else cd /home/carma/ git clone https://github.com/usdot-fhwa-stol/autoware.ai.git --depth 1 --branch carma-develop