From b62b06443b991cdb72ecde1a10a9fec72d1df957 Mon Sep 17 00:00:00 2001 From: "Takagi, Isamu" <43976882+isamu-takagi@users.noreply.github.com> Date: Thu, 25 Apr 2024 21:20:00 +0900 Subject: [PATCH] feat: update docker ci (#8) Signed-off-by: Takagi, Isamu --- .github/actions/docker-build-and-push/action.yaml | 3 ++- .github/workflows/docker-build-and-push-main.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/actions/docker-build-and-push/action.yaml b/.github/actions/docker-build-and-push/action.yaml index b79da13fa23..251868ac790 100644 --- a/.github/actions/docker-build-and-push/action.yaml +++ b/.github/actions/docker-build-and-push/action.yaml @@ -53,7 +53,8 @@ runs: uses: docker/bake-action@v2 with: # Checking event_name for https://github.com/autowarefoundation/autoware/issues/2796 - push: ${{ github.event_name == 'schedule' || github.ref_name == github.event.repository.default_branch || github.event_name == 'push'}} + push: ${{ github.ref_name == github.event.repository.default_branch}} + targets: runtime files: | docker/${{ inputs.bake-target }}/docker-bake.hcl ${{ steps.meta-runtime.outputs.bake-file }} diff --git a/.github/workflows/docker-build-and-push-main.yaml b/.github/workflows/docker-build-and-push-main.yaml index 87a3337fe0b..c9458937c73 100644 --- a/.github/workflows/docker-build-and-push-main.yaml +++ b/.github/workflows/docker-build-and-push-main.yaml @@ -40,7 +40,7 @@ jobs: *.args.BASE_IMAGE=${{ env[format('{0}', matrix.base_image_env)] }} *.args.SETUP_ARGS=${{ matrix.setup-args }} tag-prefix: ${{ env.rosdistro }}- - tag-suffix: ${{ matrix.additional-tag-suffix }}-amd64 + tag-suffix: ${{ matrix.additional-tag-suffix }} - name: Show disk space run: |