diff --git a/.circleci/config.yml b/.circleci/config.yml index 0fa93d7f77e..b582398f27d 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: usdotfhwastolcanididate/carma-base:lavida + - image: usdotfhwastol/carma-base:carma-system-4.5.0 user: carma environment: TERM: xterm diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml index a797d55565b..c024dbf20cb 100644 --- a/.github/workflows/dockerhub.yml +++ b/.github/workflows/dockerhub.yml @@ -6,23 +6,11 @@ on: - "carma-develop" - "master" - "release/*" - - "release/lavida" + tags: + - "carma-system-*" jobs: dockerhub: - runs-on: ubuntu-latest-8-cores - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Login to DockerHub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build - uses: docker/build-push-action@v3 - with: - context: . - push: true - tags: usdotfhwastolcandidate/${{ github.event.repository.name }}:lavida + uses: usdot-fhwa-stol/actions/.github/workflows/dockerhub.yml@main + secrets: + DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/Dockerfile b/Dockerfile index 32c4a9818d2..90adbe65625 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM usdotfhwastolcandidate/carma-base:lavida AS base_image +FROM usdotfhwastol/carma-base:carma-system-4.5.0 AS base_image FROM base_image AS build diff --git a/docker/checkout.bash b/docker/checkout.bash index b10fc326150..717b0f17400 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 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 + git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-msgs.git --branch carma-system-4.5.0 + git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-utils.git --branch carma-system-4.5.0 + git clone --depth=1 https://github.com/usdot-fhwa-stol/autoware.auto.git --branch carma-system-4.5.0 fi # Required to build pacmod_msgs