From a160d51a3b920803824200dd7276b0cf36197130 Mon Sep 17 00:00:00 2001 From: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com> Date: Tue, 24 May 2022 21:25:03 +0900 Subject: [PATCH] ci(update-docker-manifest): create aliases for CUDA images (#355) * ci(update-docker-manifest): create aliases for CUDA images Signed-off-by: Kenji Miyake * fix Signed-off-by: Kenji Miyake --- .../create-main-distro-alias/action.yaml | 30 ++++--------------- .github/workflows/update-docker-manifest.yaml | 24 ++++++++++++++- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/.github/actions/create-main-distro-alias/action.yaml b/.github/actions/create-main-distro-alias/action.yaml index a8a08b89..bdfe0cf4 100644 --- a/.github/actions/create-main-distro-alias/action.yaml +++ b/.github/actions/create-main-distro-alias/action.yaml @@ -8,6 +8,9 @@ inputs: rosdistro: description: "" required: true + tag-name: + description: "" + required: true runs: using: composite @@ -27,28 +30,7 @@ runs: - name: Create Docker manifest for latest run: | # Check image existence - distro_image="${{ steps.set-image-name.outputs.image-name }}:${{ inputs.rosdistro }}-latest" - if docker manifest inspect "$distro_image-amd64" >/dev/null 2>&1; then - amd64_image="$distro_image-amd64" - fi - if docker manifest inspect "$distro_image-arm64" >/dev/null 2>&1; then - arm64_image="$distro_image-arm64" - fi - - echo "amd64_image: $amd64_image" - echo "arm64_image: $arm64_image" - - docker manifest create --amend ${{ steps.set-image-name.outputs.image-name }}:latest \ - $amd64_image \ - $arm64_image - - docker manifest push ${{ steps.set-image-name.outputs.image-name }}:latest - shell: bash - - - name: Create Docker manifest for latest-prebuilt - run: | - # Check image existence - distro_image="${{ steps.set-image-name.outputs.image-name }}:${{ inputs.rosdistro }}-latest-prebuilt" + distro_image="${{ steps.set-image-name.outputs.image-name }}:${{ inputs.rosdistro }}-${{ inputs.tag-name }}" if docker manifest inspect "$distro_image-amd64" >/dev/null 2>&1; then amd64_image="$distro_image-amd64" fi @@ -59,9 +41,9 @@ runs: echo "amd64_image: $amd64_image" echo "arm64_image: $arm64_image" - docker manifest create --amend ${{ steps.set-image-name.outputs.image-name }}:latest-prebuilt \ + docker manifest create --amend ${{ steps.set-image-name.outputs.image-name }}:${{ inputs.tag-name }} \ $amd64_image \ $arm64_image - docker manifest push ${{ steps.set-image-name.outputs.image-name }}:latest-prebuilt + docker manifest push ${{ steps.set-image-name.outputs.image-name }}:${{ inputs.tag-name }} shell: bash diff --git a/.github/workflows/update-docker-manifest.yaml b/.github/workflows/update-docker-manifest.yaml index d1090083..b92c9403 100644 --- a/.github/workflows/update-docker-manifest.yaml +++ b/.github/workflows/update-docker-manifest.yaml @@ -17,8 +17,30 @@ jobs: with: package-name: autoware-universe - - name: Create main distro alias for 'autoware-universe' + - name: Create alias from 'autoware-universe:{rosdistro}-latest' to 'autoware-universe:latest' uses: ./.github/actions/create-main-distro-alias with: package-name: autoware-universe rosdistro: galactic + tag-name: latest + + - name: Create alias from 'autoware-universe:{rosdistro}-latest-prebuilt' to 'autoware-universe:latest-prebuilt' + uses: ./.github/actions/create-main-distro-alias + with: + package-name: autoware-universe + rosdistro: galactic + tag-name: latest-prebuilt + + - name: Create alias from 'autoware-universe:{rosdistro}-latest-cuda' to 'autoware-universe:latest-cuda' + uses: ./.github/actions/create-main-distro-alias + with: + package-name: autoware-universe + rosdistro: galactic + tag-name: latest-cuda + + - name: Create alias from 'autoware-universe:{rosdistro}-latest-prebuilt-cuda' to 'autoware-universe:latest-prebuilt-cuda' + uses: ./.github/actions/create-main-distro-alias + with: + package-name: autoware-universe + rosdistro: galactic + tag-name: latest-prebuilt-cuda