diff --git a/.circleci/config.yml b/.circleci/config.yml index 167515f..371a031 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:carma-system-3.10.0 + - image: usdotfhwastol/carma-base:carma-system-3.11.0 user: carma environment: TERM: xterm # use xterm to get full display output from build diff --git a/Dockerfile b/Dockerfile index 7991446..c4f90c4 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:carma-system-3.10.0 as setup +FROM usdotfhwastol/carma-base:carma-system-3.11.0 as setup RUN mkdir ~/src COPY --chown=carma . /home/carma/src/ RUN ~/src/docker/checkout.bash RUN ~/src/docker/install.sh -FROM usdotfhwastol/carma-base:carma-system-3.10.0 +FROM usdotfhwastol/carma-base:carma-system-3.11.0 ARG BUILD_DATE="NULL" ARG VERSION="NULL" diff --git a/docker/checkout.bash b/docker/checkout.bash index b6fe553..00aad59 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 ${dir}/src/CARMAMsgs --branch $BRANCH git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch $BRANCH else - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch carma-system-3.10.0 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch carma-system-3.10.0 + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch carma-system-3.11.0 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch carma-system-3.11.0 fi