From cdecffedf0edd49da6649b4e354af7325c17c4a1 Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Mon, 2 Dec 2024 14:49:18 +0900 Subject: [PATCH 1/4] add tag pattern Signed-off-by: Yutaka Kondo --- .github/workflows/docker-build-and-push-arm64.yaml | 1 + .github/workflows/docker-build-and-push.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/docker-build-and-push-arm64.yaml b/.github/workflows/docker-build-and-push-arm64.yaml index ee50b26361..702ceef5c1 100644 --- a/.github/workflows/docker-build-and-push-arm64.yaml +++ b/.github/workflows/docker-build-and-push-arm64.yaml @@ -5,6 +5,7 @@ on: branches: - main tags: + - *.*.* workflow_dispatch: jobs: diff --git a/.github/workflows/docker-build-and-push.yaml b/.github/workflows/docker-build-and-push.yaml index 4fbcb666b0..d7997c194c 100644 --- a/.github/workflows/docker-build-and-push.yaml +++ b/.github/workflows/docker-build-and-push.yaml @@ -5,6 +5,7 @@ on: branches: - main tags: + - *.*.* workflow_dispatch: jobs: From f888c73687a78179c34c055603d00724d8050e2f Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Mon, 2 Dec 2024 14:53:29 +0900 Subject: [PATCH 2/4] fix syntax Signed-off-by: Yutaka Kondo --- .github/workflows/docker-build-and-push-arm64.yaml | 2 +- .github/workflows/docker-build-and-push.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build-and-push-arm64.yaml b/.github/workflows/docker-build-and-push-arm64.yaml index 702ceef5c1..7242629c59 100644 --- a/.github/workflows/docker-build-and-push-arm64.yaml +++ b/.github/workflows/docker-build-and-push-arm64.yaml @@ -5,7 +5,7 @@ on: branches: - main tags: - - *.*.* + - "*.*.*" workflow_dispatch: jobs: diff --git a/.github/workflows/docker-build-and-push.yaml b/.github/workflows/docker-build-and-push.yaml index d7997c194c..280fe2efbb 100644 --- a/.github/workflows/docker-build-and-push.yaml +++ b/.github/workflows/docker-build-and-push.yaml @@ -5,7 +5,7 @@ on: branches: - main tags: - - *.*.* + - "*.*.*" workflow_dispatch: jobs: From 69e245866051d2a1d9c645e70f68eac905bcecbd Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Mon, 2 Dec 2024 15:13:21 +0900 Subject: [PATCH 3/4] add tags Signed-off-by: Yutaka Kondo --- .../actions/docker-build-and-push-cuda/action.yaml | 4 ++++ .github/actions/docker-build-and-push/action.yaml | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/.github/actions/docker-build-and-push-cuda/action.yaml b/.github/actions/docker-build-and-push-cuda/action.yaml index bf9d9ca085..dd97dfcdde 100644 --- a/.github/actions/docker-build-and-push-cuda/action.yaml +++ b/.github/actions/docker-build-and-push-cuda/action.yaml @@ -72,6 +72,7 @@ runs: tags: | type=raw,value=universe-sensing-perception-devel-cuda-${{ inputs.platform }} type=raw,value=universe-sensing-perception-devel-cuda-${{ steps.date.outputs.date }}-${{ inputs.platform }} + type=ref,event=tag,value=universe-sensing-perception-devel-cuda-${{ github.ref_name }}-${{ inputs.platform }} bake-target: docker-metadata-action-universe-sensing-perception-devel-cuda flavor: | latest=false @@ -84,6 +85,7 @@ runs: tags: | type=raw,value=universe-sensing-perception-cuda-${{ inputs.platform }} type=raw,value=universe-sensing-perception-cuda-${{ steps.date.outputs.date }}-${{ inputs.platform }} + type=ref,event=tag,value=universe-sensing-perception-cuda-${{ github.ref_name }}-${{ inputs.platform }} bake-target: docker-metadata-action-universe-sensing-perception-cuda flavor: | latest=false @@ -96,6 +98,7 @@ runs: tags: | type=raw,value=universe-devel-cuda-${{ inputs.platform }} type=raw,value=universe-devel-cuda-${{ steps.date.outputs.date }}-${{ inputs.platform }} + type=ref,event=tag,value=universe-devel-cuda-${{ github.ref_name }}-${{ inputs.platform }} bake-target: docker-metadata-action-universe-devel-cuda flavor: | latest=false @@ -108,6 +111,7 @@ runs: tags: | type=raw,value=universe-cuda-${{ inputs.platform }} type=raw,value=universe-cuda-${{ steps.date.outputs.date }}-${{ inputs.platform }} + type=ref,event=tag,value=universe-cuda-${{ github.ref_name }}-${{ inputs.platform }} bake-target: docker-metadata-action-universe-cuda flavor: | latest=auto diff --git a/.github/actions/docker-build-and-push/action.yaml b/.github/actions/docker-build-and-push/action.yaml index c028eede58..ede4e8694a 100644 --- a/.github/actions/docker-build-and-push/action.yaml +++ b/.github/actions/docker-build-and-push/action.yaml @@ -72,6 +72,7 @@ runs: tags: | type=raw,value=core-devel-${{ inputs.platform }} type=raw,value=core-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} + type=ref,event=tag,value=core-devel-${{ github.ref_name }}-${{ inputs.platform }} bake-target: docker-metadata-action-core-devel flavor: | latest=false @@ -84,6 +85,7 @@ runs: tags: | type=raw,value=universe-sensing-perception-devel-${{ inputs.platform }} type=raw,value=universe-sensing-perception-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} + type=ref,event=tag,value=universe-sensing-perception-devel-${{ github.ref_name }}-${{ inputs.platform }} bake-target: docker-metadata-action-universe-sensing-perception-devel flavor: | latest=false @@ -96,6 +98,7 @@ runs: tags: | type=raw,value=universe-sensing-perception-${{ inputs.platform }} type=raw,value=universe-sensing-perception-${{ steps.date.outputs.date }}-${{ inputs.platform }} + type=ref,event=tag,value=universe-sensing-perception-${{ github.ref_name }}-${{ inputs.platform }} bake-target: docker-metadata-action-universe-sensing-perception flavor: | latest=false @@ -108,6 +111,7 @@ runs: tags: | type=raw,value=universe-localization-mapping-devel-${{ inputs.platform }} type=raw,value=universe-localization-mapping-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} + type=ref,event=tag,value=universe-localization-mapping-devel-${{ github.ref_name }}-${{ inputs.platform }} bake-target: docker-metadata-action-universe-localization-mapping-devel flavor: | latest=false @@ -120,6 +124,7 @@ runs: tags: | type=raw,value=universe-localization-mapping-${{ inputs.platform }} type=raw,value=universe-localization-mapping-${{ steps.date.outputs.date }}-${{ inputs.platform }} + type=ref,event=tag,value=universe-localization-mapping-${{ github.ref_name }}-${{ inputs.platform }} bake-target: docker-metadata-action-universe-localization-mapping flavor: | latest=false @@ -132,6 +137,7 @@ runs: tags: | type=raw,value=universe-planning-control-devel-${{ inputs.platform }} type=raw,value=universe-planning-control-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} + type=ref,event=tag,value=universe-planning-control-devel-${{ github.ref_name }}-${{ inputs.platform }} bake-target: docker-metadata-action-universe-planning-control-devel flavor: | latest=false @@ -144,6 +150,7 @@ runs: tags: | type=raw,value=universe-planning-control-${{ inputs.platform }} type=raw,value=universe-planning-control-${{ steps.date.outputs.date }}-${{ inputs.platform }} + type=ref,event=tag,value=universe-planning-control-${{ github.ref_name }}-${{ inputs.platform }} bake-target: docker-metadata-action-universe-planning-control flavor: | latest=false @@ -156,6 +163,7 @@ runs: tags: | type=raw,value=universe-vehicle-system-devel-${{ inputs.platform }} type=raw,value=universe-vehicle-system-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} + type=ref,event=tag,value=universe-vehicle-system-devel-${{ github.ref_name }}-${{ inputs.platform }} bake-target: docker-metadata-action-universe-vehicle-system-devel flavor: | latest=false @@ -168,6 +176,7 @@ runs: tags: | type=raw,value=universe-vehicle-system-${{ inputs.platform }} type=raw,value=universe-vehicle-system-${{ steps.date.outputs.date }}-${{ inputs.platform }} + type=ref,event=tag,value=universe-vehicle-system-${{ github.ref_name }}-${{ inputs.platform }} bake-target: docker-metadata-action-universe-vehicle-system flavor: | latest=false @@ -180,6 +189,7 @@ runs: tags: | type=raw,value=universe-devel-${{ inputs.platform }} type=raw,value=universe-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} + type=ref,event=tag,value=universe-devel-${{ github.ref_name }}-${{ inputs.platform }} bake-target: docker-metadata-action-universe-devel flavor: | latest=false @@ -192,6 +202,7 @@ runs: tags: | type=raw,value=universe-${{ inputs.platform }} type=raw,value=universe-${{ steps.date.outputs.date }}-${{ inputs.platform }} + type=ref,event=tag,value=universe-${{ github.ref_name }}-${{ inputs.platform }} bake-target: docker-metadata-action-universe flavor: | latest=auto From f91851599a3a1696fb9fab0a4c6fcae096a0a3fb Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Mon, 2 Dec 2024 16:07:59 +0900 Subject: [PATCH 4/4] fix prefix and suffix Signed-off-by: Yutaka Kondo --- .../docker-build-and-push-cuda/action.yaml | 10 ++++----- .../actions/docker-build-and-push/action.yaml | 22 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/actions/docker-build-and-push-cuda/action.yaml b/.github/actions/docker-build-and-push-cuda/action.yaml index dd97dfcdde..92e7fcf01e 100644 --- a/.github/actions/docker-build-and-push-cuda/action.yaml +++ b/.github/actions/docker-build-and-push-cuda/action.yaml @@ -72,7 +72,7 @@ runs: tags: | type=raw,value=universe-sensing-perception-devel-cuda-${{ inputs.platform }} type=raw,value=universe-sensing-perception-devel-cuda-${{ steps.date.outputs.date }}-${{ inputs.platform }} - type=ref,event=tag,value=universe-sensing-perception-devel-cuda-${{ github.ref_name }}-${{ inputs.platform }} + type=ref,event=tag,prefix=universe-sensing-perception-devel-cuda-,suffix=-${{ inputs.platform }} bake-target: docker-metadata-action-universe-sensing-perception-devel-cuda flavor: | latest=false @@ -85,7 +85,7 @@ runs: tags: | type=raw,value=universe-sensing-perception-cuda-${{ inputs.platform }} type=raw,value=universe-sensing-perception-cuda-${{ steps.date.outputs.date }}-${{ inputs.platform }} - type=ref,event=tag,value=universe-sensing-perception-cuda-${{ github.ref_name }}-${{ inputs.platform }} + type=ref,event=tag,prefix=universe-sensing-perception-cuda-,suffix=-${{ inputs.platform }} bake-target: docker-metadata-action-universe-sensing-perception-cuda flavor: | latest=false @@ -98,7 +98,7 @@ runs: tags: | type=raw,value=universe-devel-cuda-${{ inputs.platform }} type=raw,value=universe-devel-cuda-${{ steps.date.outputs.date }}-${{ inputs.platform }} - type=ref,event=tag,value=universe-devel-cuda-${{ github.ref_name }}-${{ inputs.platform }} + type=ref,event=tag,prefix=universe-devel-cuda-,suffix=-${{ inputs.platform }} bake-target: docker-metadata-action-universe-devel-cuda flavor: | latest=false @@ -111,10 +111,10 @@ runs: tags: | type=raw,value=universe-cuda-${{ inputs.platform }} type=raw,value=universe-cuda-${{ steps.date.outputs.date }}-${{ inputs.platform }} - type=ref,event=tag,value=universe-cuda-${{ github.ref_name }}-${{ inputs.platform }} + type=ref,event=tag,prefix=universe-cuda-,suffix=-${{ inputs.platform }} bake-target: docker-metadata-action-universe-cuda flavor: | - latest=auto + latest=false - name: Login to GitHub Container Registry uses: docker/login-action@v3 diff --git a/.github/actions/docker-build-and-push/action.yaml b/.github/actions/docker-build-and-push/action.yaml index ede4e8694a..5feb1bcc41 100644 --- a/.github/actions/docker-build-and-push/action.yaml +++ b/.github/actions/docker-build-and-push/action.yaml @@ -72,7 +72,7 @@ runs: tags: | type=raw,value=core-devel-${{ inputs.platform }} type=raw,value=core-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} - type=ref,event=tag,value=core-devel-${{ github.ref_name }}-${{ inputs.platform }} + type=ref,event=tag,prefix=core-devel-,suffix=-${{ inputs.platform }} bake-target: docker-metadata-action-core-devel flavor: | latest=false @@ -85,7 +85,7 @@ runs: tags: | type=raw,value=universe-sensing-perception-devel-${{ inputs.platform }} type=raw,value=universe-sensing-perception-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} - type=ref,event=tag,value=universe-sensing-perception-devel-${{ github.ref_name }}-${{ inputs.platform }} + type=ref,event=tag,prefix=universe-sensing-perception-devel-,suffix=-${{ inputs.platform }} bake-target: docker-metadata-action-universe-sensing-perception-devel flavor: | latest=false @@ -98,7 +98,7 @@ runs: tags: | type=raw,value=universe-sensing-perception-${{ inputs.platform }} type=raw,value=universe-sensing-perception-${{ steps.date.outputs.date }}-${{ inputs.platform }} - type=ref,event=tag,value=universe-sensing-perception-${{ github.ref_name }}-${{ inputs.platform }} + type=ref,event=tag,prefix=universe-sensing-perception-,suffix=-${{ inputs.platform }} bake-target: docker-metadata-action-universe-sensing-perception flavor: | latest=false @@ -111,7 +111,7 @@ runs: tags: | type=raw,value=universe-localization-mapping-devel-${{ inputs.platform }} type=raw,value=universe-localization-mapping-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} - type=ref,event=tag,value=universe-localization-mapping-devel-${{ github.ref_name }}-${{ inputs.platform }} + type=ref,event=tag,prefix=universe-localization-mapping-devel-,suffix=-${{ inputs.platform }} bake-target: docker-metadata-action-universe-localization-mapping-devel flavor: | latest=false @@ -124,7 +124,7 @@ runs: tags: | type=raw,value=universe-localization-mapping-${{ inputs.platform }} type=raw,value=universe-localization-mapping-${{ steps.date.outputs.date }}-${{ inputs.platform }} - type=ref,event=tag,value=universe-localization-mapping-${{ github.ref_name }}-${{ inputs.platform }} + type=ref,event=tag,prefix=universe-localization-mapping-,suffix=-${{ inputs.platform }} bake-target: docker-metadata-action-universe-localization-mapping flavor: | latest=false @@ -137,7 +137,7 @@ runs: tags: | type=raw,value=universe-planning-control-devel-${{ inputs.platform }} type=raw,value=universe-planning-control-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} - type=ref,event=tag,value=universe-planning-control-devel-${{ github.ref_name }}-${{ inputs.platform }} + type=ref,event=tag,prefix=universe-planning-control-devel-,suffix=-${{ inputs.platform }} bake-target: docker-metadata-action-universe-planning-control-devel flavor: | latest=false @@ -150,7 +150,7 @@ runs: tags: | type=raw,value=universe-planning-control-${{ inputs.platform }} type=raw,value=universe-planning-control-${{ steps.date.outputs.date }}-${{ inputs.platform }} - type=ref,event=tag,value=universe-planning-control-${{ github.ref_name }}-${{ inputs.platform }} + type=ref,event=tag,prefix=universe-planning-control-,suffix=-${{ inputs.platform }} bake-target: docker-metadata-action-universe-planning-control flavor: | latest=false @@ -163,7 +163,7 @@ runs: tags: | type=raw,value=universe-vehicle-system-devel-${{ inputs.platform }} type=raw,value=universe-vehicle-system-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} - type=ref,event=tag,value=universe-vehicle-system-devel-${{ github.ref_name }}-${{ inputs.platform }} + type=ref,event=tag,prefix=universe-vehicle-system-devel-,suffix=-${{ inputs.platform }} bake-target: docker-metadata-action-universe-vehicle-system-devel flavor: | latest=false @@ -176,7 +176,7 @@ runs: tags: | type=raw,value=universe-vehicle-system-${{ inputs.platform }} type=raw,value=universe-vehicle-system-${{ steps.date.outputs.date }}-${{ inputs.platform }} - type=ref,event=tag,value=universe-vehicle-system-${{ github.ref_name }}-${{ inputs.platform }} + type=ref,event=tag,prefix=universe-vehicle-system-,suffix=-${{ inputs.platform }} bake-target: docker-metadata-action-universe-vehicle-system flavor: | latest=false @@ -189,7 +189,7 @@ runs: tags: | type=raw,value=universe-devel-${{ inputs.platform }} type=raw,value=universe-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} - type=ref,event=tag,value=universe-devel-${{ github.ref_name }}-${{ inputs.platform }} + type=ref,event=tag,prefix=universe-devel-,suffix=-${{ inputs.platform }} bake-target: docker-metadata-action-universe-devel flavor: | latest=false @@ -202,7 +202,7 @@ runs: tags: | type=raw,value=universe-${{ inputs.platform }} type=raw,value=universe-${{ steps.date.outputs.date }}-${{ inputs.platform }} - type=ref,event=tag,value=universe-${{ github.ref_name }}-${{ inputs.platform }} + type=ref,event=tag,prefix=universe-,suffix=-${{ inputs.platform }} bake-target: docker-metadata-action-universe flavor: | latest=auto