Move image save and upload to build.yaml. Add debug echo for tags

Author: shaun-nx

.github/workflows/build.yml

@@ -193,11 +193,27 @@ jobs:
         with:
           sarif_file: ${{ steps.scan.outputs.sarif }}
           category: build-${{ inputs.image }}
+      
+      - name: Save NGINX Gateway Fabric image
+        if: ${{ inputs.image == 'ngf' }}
+        run: |
+          IMAGE_TAG=$(echo "${{ steps.meta.outputs.tags }}" | grep '^localhost:5000/nginx-gateway-fabric/ngf:' | head -n 1)
+          docker save -o ngf-image.tar $IMAGE_TAG
+
+      - name: Upload NGINX Gateway Fabric image artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ngf-image
+          path: ngf-image.tar
+
+      - name: Show all image tags for debugging
+        run: echo "${{ steps.meta.outputs.tags }}"
 
       - name: Save NGINX OSS image as tarball
         if: ${{ inputs.image == 'nginx' }}
         run: |
-          docker save -o nginx-oss-image.tar localhost:5000/nginx-gateway-fabric/nginx:${{ github.run_id }}-${{ github.run_number }}
+          IMAGE_TAG=$(echo "${{ steps.meta.outputs.tags }}" | grep '^localhost:5000/nginx-gateway-fabric/nginx:' | head -n 1)
+          docker save -o nginx-oss-image.tar $IMAGE_TAG
 
       - name: Upload NGINX OSS image artifact
         if: ${{ inputs.image == 'nginx' }}
@@ -209,7 +225,8 @@ jobs:
       - name: Save Operator image as tarball
         if: ${{ inputs.image == 'operator' }}
         run: |
-          docker save -o operator-image.tar localhost:5000/nginx-gateway-fabric/operator:${{ github.run_id }}-${{ github.run_number }}
+          IMAGE_TAG=$(echo "${{ steps.meta.outputs.tags }}" | grep '^localhost:5000/nginx-gateway-fabric/operator:' | head -n 1)
+          docker save -o operator-image.tar $IMAGE_TAG
 
       - name: Upload Operator image artifact
         if: ${{ inputs.image == 'operator' }}

.github/workflows/ci.yml

@@ -271,15 +271,6 @@ jobs:
           path: ${{ github.workspace }}/dist
           key: nginx-gateway-fabric-${{ github.run_id }}-${{ github.run_number }}
 
-      - name: Save NGINX Gateway Fabric image
-        run: docker save -o ngf-image.tar localhost:5000/nginx/nginx-gateway-fabric:${{ github.run_id }}-${{ github.run_number }}
-
-      - name: Upload NGINX Gateway Fabric image artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ngf-image
-          path: ngf-image.tar
-
   assertion:
     name: Generate and Sign Assertion Documents
     needs: [vars, binary]