From ba454b4d868d866d4fca97b69b0a887f1e8696ff Mon Sep 17 00:00:00 2001
From: Hiroshiba Kazuyuki <hihokaruta@gmail.com>
Date: Sun, 16 Jan 2022 12:56:04 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=83=AA=E3=83=BC=E3=82=B9=E3=81=A7?=
 =?UTF-8?q?=E3=81=82=E3=82=8C=E3=81=B0=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=80=81=E3=81=9D?=
 =?UTF-8?q?=E3=82=8C=E4=BB=A5=E5=A4=96=E3=81=A7=E3=81=82=E3=82=8C=E3=81=B0?=
 =?UTF-8?q?latest=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build-docker.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 827ddb93a..7fbfa66ef 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -93,15 +93,16 @@ jobs:
       - name: Build and Deploy Docker image
         uses: docker/build-push-action@v2
         env:
-          IMAGE_TAG: ${{ env.IMAGE_NAME }}:${{ matrix.tag }}${{ (matrix.tag != '' && '-') || '' }}latest
-          VERSIONED_IMAGE_TAG: |
+          IMAGE_TAG: |- # If it's a release, add the version, otherwise add the `latest`
             ${{ (
               github.event.release.tag_name != '' && (
                 matrix.tag != '' && (
                   format('{0}:{1}-{2}', env.IMAGE_NAME, matrix.tag, github.event.release.tag_name)
                 ) || format('{0}:{1}', env.IMAGE_NAME, github.event.release.tag_name)
               )
-            ) || '' }}
+            ) || (
+              format('{0}:{1}{2}latest', env.IMAGE_NAME, matrix.tag, (matrix.tag != '' && '-') || ''
+            ) }}
         with:
           context: .
           builder: ${{ steps.buildx.outputs.name }}
@@ -117,8 +118,6 @@ jobs:
             ONNXRUNTIME_URL=${{ matrix.onnxruntime_url }}
           target: ${{ matrix.target }}
           push: true
-          tags: |
-            ${{ env.IMAGE_TAG }}
-            ${{ env.VERSIONED_IMAGE_TAG }}
+          tags: ${{ env.IMAGE_TAG }}
           cache-from: type=registry,ref=${{ env.IMAGE_TAG }}-buildcache
           cache-to: type=registry,ref=${{ env.IMAGE_TAG }}-buildcache,mode=max