From 5de2d3a9a3c51b10bbd5b81d4ae639e4e483d86d Mon Sep 17 00:00:00 2001
From: adrianc <adrianc@nvidia.com>
Date: Wed, 29 Nov 2023 14:28:07 +0200
Subject: [PATCH] Fix release workflow

- remove "latest" image tage from docker meta
- remove use of IMAGE_NAME in manifest creation as
  docker meta tag is the full image name

Signed-off-by: adrianc <adrianc@nvidia.com>
---
 .github/workflows/image-push-release.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/image-push-release.yml b/.github/workflows/image-push-release.yml
index 398e03077..27fc3ffe8 100644
--- a/.github/workflows/image-push-release.yml
+++ b/.github/workflows/image-push-release.yml
@@ -30,6 +30,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: ${{ env.IMAGE_NAME }}
+          flavor: |
+            latest=false
           tags: |
             type=ref,event=tag
 
@@ -41,7 +43,6 @@ jobs:
           platforms: linux/amd64
           tags: |
             ${{ steps.docker_meta.outputs.tags }}-amd64
-            ${{ steps.docker_meta.outputs.tags }}:${{ github.sha }}
           file: ./Dockerfile
 
   build-and-push-arm64-sriov-cni:
@@ -66,6 +67,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: ${{ env.IMAGE_NAME }}
+          flavor: |
+            latest=false
           tags: |
             type=ref,event=tag
 
@@ -101,6 +104,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: ${{ env.IMAGE_NAME }}
+          flavor: |
+            latest=false
           tags: |
             type=ref,event=tag
 
@@ -126,6 +131,8 @@ jobs:
       uses: docker/metadata-action@v4
       with:
         images: ${{ env.IMAGE_NAME }}
+        flavor: |
+          latest=false
         tags: |
           type=ref,event=tag
 
@@ -138,7 +145,7 @@ jobs:
 
     - name: Create manifest for multi-arch images
       run: |
-        docker buildx imagetools create -t ${{ env.IMAGE_NAME }}:${{ steps.docker_meta.outputs.tags }} \
-        ${{ env.IMAGE_NAME }}:${{ steps.docker_meta.outputs.tags }}-amd64 \
-        ${{ env.IMAGE_NAME }}:${{ steps.docker_meta.outputs.tags }}-arm64 \
-        ${{ env.IMAGE_NAME }}:${{ steps.docker_meta.outputs.tags }}-ppc64le
+        docker buildx imagetools create -t ${{ steps.docker_meta.outputs.tags }} \
+        ${{ steps.docker_meta.outputs.tags }}-amd64 \
+        ${{ steps.docker_meta.outputs.tags }}-arm64 \
+        ${{ steps.docker_meta.outputs.tags }}-ppc64le