Skip to content

Commit

Permalink
Update config files to point candidate images
Browse files Browse the repository at this point in the history
  • Loading branch information
SaikrishnaBairamoni authored Feb 9, 2024
1 parent 04c50b7 commit 1cc6d68
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: usdotfhwastolcanididate/carma-base:lavida
user: carma
environment:
TERM: xterm
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/dockerhub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- "carma-develop"
- "master"
- "release/*"
- "release/lavida"
jobs:
dockerhub:
runs-on: ubuntu-latest-8-cores
Expand All @@ -24,4 +25,4 @@ jobs:
with:
context: .
push: true
tags: usdotfhwastoldev/${{ github.event.repository.name }}:carma-develop
tags: usdotfhwastolcandidate/${{ github.event.repository.name }}:lavida
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM usdotfhwastoldev/carma-base:develop AS base_image
FROM usdotfhwastolcanidate/carma-base:lavida AS base_image

FROM base_image AS build

Expand Down
6 changes: 3 additions & 3 deletions docker/checkout.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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 release/lavida
git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-utils.git --branch release/lavida
git clone --depth=1 https://github.com/usdot-fhwa-stol/autoware.auto.git --branch release/lavida
fi

# Required to build pacmod_msgs
Expand Down

0 comments on commit 1cc6d68

Please sign in to comment.