Fixed buildx-publish

prabhuk25 · web-flow · commit ed30b94ff24d · 2026-02-17T11:31:38.000+05:30
Signed-off-by: Prabhu K &lt;Prabhu.K@ibm.com&gt;
diff --git a/.github/workflows/pr-check-ubi10.yaml b/.github/workflows/pr-check-ubi10.yaml
@@ -166,50 +166,15 @@ jobs:
           echo "=========================================="
           echo "Publishing UBI10 base image manifest"
           echo "=========================================="
-          echo "Verifying all architecture images exist..."
-          docker manifest inspect ${{ env.REGISTRY }}/base-developer-image:amd64-ubi10-pr-${{github.event.number}} || {
-            echo "ERROR: amd64 base image not found"
-            exit 1
-          }
-          docker manifest inspect ${{ env.REGISTRY }}/base-developer-image:arm64-ubi10-pr-${{github.event.number}} || {
-            echo "ERROR: arm64 base image not found"
-            exit 1
-          }
-          docker manifest inspect ${{ env.REGISTRY }}/base-developer-image:ppc64le-ubi10-pr-${{github.event.number}} || {
-            echo "ERROR: ppc64le base image not found"
-            exit 1
-          }
-          echo "All images verified, extracting digests..."
-
-          # Extract the actual image digest for each architecture from the manifest list
-          AMD64_DIGEST=$(docker manifest inspect ${{ env.REGISTRY }}/base-developer-image:amd64-ubi10-pr-${{github.event.number}} | \
-            jq -r '.manifests[] | select(.platform.architecture == "amd64") | .digest')
-          ARM64_DIGEST=$(docker manifest inspect ${{ env.REGISTRY }}/base-developer-image:arm64-ubi10-pr-${{github.event.number}} | \
-            jq -r '.manifests[] | select(.platform.architecture == "arm64") | .digest')
-          PPC64LE_DIGEST=$(docker manifest inspect ${{ env.REGISTRY }}/base-developer-image:ppc64le-ubi10-pr-${{github.event.number}} | \
-            jq -r '.manifests[] | select(.platform.architecture == "ppc64le") | .digest')
-
-          echo "AMD64 digest: $AMD64_DIGEST"
-          echo "ARM64 digest: $ARM64_DIGEST"
-          echo "PPC64LE digest: $PPC64LE_DIGEST"
-
-          echo "Creating multi-arch manifest..."
-          docker manifest create ${{ env.REGISTRY }}/base-developer-image:ubi10-pr-${{github.event.number}} \
-            --amend ${{ env.REGISTRY }}/base-developer-image@$AMD64_DIGEST \
-            --amend ${{ env.REGISTRY }}/base-developer-image@$ARM64_DIGEST \
-            --amend ${{ env.REGISTRY }}/base-developer-image@$PPC64LE_DIGEST
 
-          docker manifest annotate ${{ env.REGISTRY }}/base-developer-image:ubi10-pr-${{github.event.number}} \
-            ${{ env.REGISTRY }}/base-developer-image@$AMD64_DIGEST \
-            --os linux --arch amd64
-          docker manifest annotate ${{ env.REGISTRY }}/base-developer-image:ubi10-pr-${{github.event.number}} \
-            ${{ env.REGISTRY }}/base-developer-image@$ARM64_DIGEST \
-            --os linux --arch arm64
-          docker manifest annotate ${{ env.REGISTRY }}/base-developer-image:ubi10-pr-${{github.event.number}} \
-            ${{ env.REGISTRY }}/base-developer-image@$PPC64LE_DIGEST \
-            --os linux --arch ppc64le
+          docker buildx imagetools create \
+            -t ${{ env.REGISTRY }}/base-developer-image:ubi10-pr-${{github.event.number}} \
+            ${{ env.REGISTRY }}/base-developer-image:amd64-ubi10-pr-${{github.event.number}} \
+            ${{ env.REGISTRY }}/base-developer-image:arm64-ubi10-pr-${{github.event.number}} \
+            ${{ env.REGISTRY }}/base-developer-image:ppc64le-ubi10-pr-${{github.event.number}}
 
-          docker manifest push ${{ env.REGISTRY }}/base-developer-image:ubi10-pr-${{github.event.number}}
+          docker buildx imagetools inspect \
+            ${{ env.REGISTRY }}/base-developer-image:ubi10-pr-${{github.event.number}}
 
   publish-udi:
     name: Publish udi (UDI10)
@@ -227,50 +192,15 @@ jobs:
           echo "=========================================="
           echo "Publishing UDI10 manifest"
           echo "=========================================="
-          echo "Verifying all architecture images exist..."
-          docker manifest inspect ${{ env.REGISTRY }}/universal-developer-image:amd64-ubi10-pr-${{github.event.number}} || {
-            echo "ERROR: amd64 UDI image not found"
-            exit 1
-          }
-          docker manifest inspect ${{ env.REGISTRY }}/universal-developer-image:arm64-ubi10-pr-${{github.event.number}} || {
-            echo "ERROR: arm64 UDI image not found"
-            exit 1
-          }
-          docker manifest inspect ${{ env.REGISTRY }}/universal-developer-image:ppc64le-ubi10-pr-${{github.event.number}} || {
-            echo "ERROR: ppc64le UDI image not found"
-            exit 1
-          }
-          echo "All images verified, extracting digests..."
-
-          # Extract the actual image digest for each architecture from the manifest list
-          AMD64_DIGEST=$(docker manifest inspect ${{ env.REGISTRY }}/universal-developer-image:amd64-ubi10-pr-${{github.event.number}} | \
-            jq -r '.manifests[] | select(.platform.architecture == "amd64") | .digest')
-          ARM64_DIGEST=$(docker manifest inspect ${{ env.REGISTRY }}/universal-developer-image:arm64-ubi10-pr-${{github.event.number}} | \
-            jq -r '.manifests[] | select(.platform.architecture == "arm64") | .digest')
-          PPC64LE_DIGEST=$(docker manifest inspect ${{ env.REGISTRY }}/universal-developer-image:ppc64le-ubi10-pr-${{github.event.number}} | \
-            jq -r '.manifests[] | select(.platform.architecture == "ppc64le") | .digest')
-
-          echo "AMD64 digest: $AMD64_DIGEST"
-          echo "ARM64 digest: $ARM64_DIGEST"
-          echo "PPC64LE digest: $ARM64_DIGEST"
-
-          echo "Creating multi-arch manifest..."
-          docker manifest create ${{ env.REGISTRY }}/universal-developer-image:ubi10-pr-${{github.event.number}} \
-            --amend ${{ env.REGISTRY }}/universal-developer-image@$AMD64_DIGEST \
-            --amend ${{ env.REGISTRY }}/universal-developer-image@$ARM64_DIGEST \
-            --amend ${{ env.REGISTRY }}/universal-developer-image@$PPC64LE_DIGEST
 
-          docker manifest annotate ${{ env.REGISTRY }}/universal-developer-image:ubi10-pr-${{github.event.number}} \
-            ${{ env.REGISTRY }}/universal-developer-image@$AMD64_DIGEST \
-            --os linux --arch amd64
-          docker manifest annotate ${{ env.REGISTRY }}/universal-developer-image:ubi10-pr-${{github.event.number}} \
-            ${{ env.REGISTRY }}/universal-developer-image@$ARM64_DIGEST \
-            --os linux --arch arm64
-          docker manifest annotate ${{ env.REGISTRY }}/universal-developer-image:ubi10-pr-${{github.event.number}} \
-            ${{ env.REGISTRY }}/universal-developer-image@$PPC64LE_DIGEST \
-            --os linux --arch ppc64le
+          docker buildx imagetools create \
+            -t ${{ env.REGISTRY }}/universal-developer-image:ubi10-pr-${{github.event.number}} \
+            ${{ env.REGISTRY }}/universal-developer-image:amd64-ubi10-pr-${{github.event.number}} \
+            ${{ env.REGISTRY }}/universal-developer-image:arm64-ubi10-pr-${{github.event.number}} \
+            ${{ env.REGISTRY }}/universal-developer-image:ppc64le-ubi10-pr-${{github.event.number}}
 
-          docker manifest push ${{ env.REGISTRY }}/universal-developer-image:ubi10-pr-${{github.event.number}}
+          docker buildx imagetools inspect \
+            ${{ env.REGISTRY }}/universal-developer-image:ubi10-pr-${{github.event.number}}
       - name: 'Comment PR'
         uses: actions/github-script@v7
         with:
diff --git a/.github/workflows/pr-check.yaml b/.github/workflows/pr-check.yaml
@@ -165,50 +165,12 @@ jobs:
           echo "=========================================="
           echo "Publishing UBI9 base image manifest"
           echo "=========================================="
-          echo "Verifying all architecture images exist..."
-          docker manifest inspect ${{ env.REGISTRY }}/base-developer-image:amd64-pr-${{github.event.number}} || {
-            echo "ERROR: amd64 base image not found"
-            exit 1
-          }
-          docker manifest inspect ${{ env.REGISTRY }}/base-developer-image:arm64-pr-${{github.event.number}} || {
-            echo "ERROR: arm64 base image not found"
-            exit 1
-          }
-          docker manifest inspect ${{ env.REGISTRY }}/base-developer-image:ppc64le-pr-${{github.event.number}} || {
-            echo "ERROR: ppc64le base image not found"
-            exit 1
-          }
-          echo "All images verified, extracting digests..."
-
-          # Extract the actual image digest for each architecture from the manifest list
-          AMD64_DIGEST=$(docker manifest inspect ${{ env.REGISTRY }}/base-developer-image:amd64-pr-${{github.event.number}} | \
-            jq -r '.manifests[] | select(.platform.architecture == "amd64") | .digest')
-          ARM64_DIGEST=$(docker manifest inspect ${{ env.REGISTRY }}/base-developer-image:arm64-pr-${{github.event.number}} | \
-            jq -r '.manifests[] | select(.platform.architecture == "arm64") | .digest')
-          PPC64LE_DIGEST=$(docker manifest inspect ${{ env.REGISTRY }}/base-developer-image:ppc64le-pr-${{github.event.number}} | \
-            jq -r '.manifests[] | select(.platform.architecture == "ppc64le") | .digest')
-
-          echo "AMD64 digest: $AMD64_DIGEST"
-          echo "ARM64 digest: $ARM64_DIGEST"
-          echo "PPC64LE digest: $PPC64LE_DIGEST"
-
-          echo "Creating multi-arch manifest..."
-          docker manifest create ${{ env.REGISTRY }}/base-developer-image:pr-${{github.event.number}} \
-            --amend ${{ env.REGISTRY }}/base-developer-image@$AMD64_DIGEST \
-            --amend ${{ env.REGISTRY }}/base-developer-image@$ARM64_DIGEST \
-            --amend ${{ env.REGISTRY }}/base-developer-image@$PPC64LE_DIGEST
-
-          docker manifest annotate ${{ env.REGISTRY }}/base-developer-image:pr-${{github.event.number}} \
-            ${{ env.REGISTRY }}/base-developer-image@$AMD64_DIGEST \
-            --os linux --arch amd64
-          docker manifest annotate ${{ env.REGISTRY }}/base-developer-image:pr-${{github.event.number}} \
-            ${{ env.REGISTRY }}/base-developer-image@$ARM64_DIGEST \
-            --os linux --arch arm64
-          docker manifest annotate ${{ env.REGISTRY }}/base-developer-image:pr-${{github.event.number}} \
-            ${{ env.REGISTRY }}/base-developer-image@$PPC64LE_DIGEST \
-            --os linux --arch ppc64le
-
-          docker manifest push ${{ env.REGISTRY }}/base-developer-image:pr-${{github.event.number}}
+          
+          docker buildx imagetools create \
+            -t ${{ env.REGISTRY }}/base-developer-image:pr-${{github.event.number}} \
+            ${{ env.REGISTRY }}/base-developer-image:amd64-pr-${{github.event.number}} \
+            ${{ env.REGISTRY }}/base-developer-image:arm64-pr-${{github.event.number}} \
+            ${{ env.REGISTRY }}/base-developer-image:ppc64le-pr-${{github.event.number}}
 
   publish-udi:
     name: Publish udi (UDI9)
@@ -226,50 +188,12 @@ jobs:
           echo "=========================================="
           echo "Publishing UDI9 manifest"
           echo "=========================================="
-          echo "Verifying all architecture images exist..."
-          docker manifest inspect ${{ env.REGISTRY }}/universal-developer-image:amd64-pr-${{github.event.number}} || {
-            echo "ERROR: amd64 UDI image not found"
-            exit 1
-          }
-          docker manifest inspect ${{ env.REGISTRY }}/universal-developer-image:arm64-pr-${{github.event.number}} || {
-            echo "ERROR: arm64 UDI image not found"
-            exit 1
-          }
-          docker manifest inspect ${{ env.REGISTRY }}/universal-developer-image:ppc64le-pr-${{github.event.number}} || {
-            echo "ERROR: ppc64le UDI image not found"
-            exit 1
-          }
-          echo "All images verified, extracting digests..."
-
-          # Extract the actual image digest for each architecture from the manifest list
-          AMD64_DIGEST=$(docker manifest inspect ${{ env.REGISTRY }}/universal-developer-image:amd64-pr-${{github.event.number}} | \
-            jq -r '.manifests[] | select(.platform.architecture == "amd64") | .digest')
-          ARM64_DIGEST=$(docker manifest inspect ${{ env.REGISTRY }}/universal-developer-image:arm64-pr-${{github.event.number}} | \
-            jq -r '.manifests[] | select(.platform.architecture == "arm64") | .digest')
-          PPC64LE_DIGEST=$(docker manifest inspect ${{ env.REGISTRY }}/universal-developer-image:ppc64le-pr-${{github.event.number}} | \
-            jq -r '.manifests[] | select(.platform.architecture == "ppc64le") | .digest')
-
-          echo "AMD64 digest: $AMD64_DIGEST"
-          echo "ARM64 digest: $ARM64_DIGEST"
-          echo "PPC64LE digest: $PPC64LE_DIGEST"
-
-          echo "Creating multi-arch manifest..."
-          docker manifest create ${{ env.REGISTRY }}/universal-developer-image:pr-${{github.event.number}} \
-            --amend ${{ env.REGISTRY }}/universal-developer-image@$AMD64_DIGEST \
-            --amend ${{ env.REGISTRY }}/universal-developer-image@$ARM64_DIGEST \
-            --amend ${{ env.REGISTRY }}/universal-developer-image@$PPC64LE_DIGEST
-
-          docker manifest annotate ${{ env.REGISTRY }}/universal-developer-image:pr-${{github.event.number}} \
-            ${{ env.REGISTRY }}/universal-developer-image@$AMD64_DIGEST \
-            --os linux --arch amd64
-          docker manifest annotate ${{ env.REGISTRY }}/universal-developer-image:pr-${{github.event.number}} \
-            ${{ env.REGISTRY }}/universal-developer-image@$ARM64_DIGEST \
-            --os linux --arch arm64
-          docker manifest annotate ${{ env.REGISTRY }}/universal-developer-image:pr-${{github.event.number}} \
-            ${{ env.REGISTRY }}/universal-developer-image@$PPC64LE_DIGEST \
-            --os linux --arch ppc64le
 
-          docker manifest push ${{ env.REGISTRY }}/universal-developer-image:pr-${{github.event.number}}
+          docker buildx imagetools create \
+            -t ${{ env.REGISTRY }}/universal-developer-image:pr-${{github.event.number}} \
+            ${{ env.REGISTRY }}/universal-developer-image:amd64-pr-${{github.event.number}} \
+            ${{ env.REGISTRY }}/universal-developer-image:arm64-pr-${{github.event.number}} \
+            ${{ env.REGISTRY }}/universal-developer-image:ppc64le-pr-${{github.event.number}}
       - name: 'Comment PR'
         uses: actions/github-script@v7
         with:
diff --git a/.github/workflows/ubi10-build.yaml b/.github/workflows/ubi10-build.yaml
@@ -89,24 +89,11 @@ jobs:
         run: |
           for tag in ubi10-latest ubi10-${{env.short_sha}};
           do
-            docker manifest create ${{ env.REGISTRY }}/base-developer-image:${tag} \
-              --amend ${{ env.REGISTRY }}/base-developer-image:amd64-ubi10-${{env.short_sha}} \
-              --amend ${{ env.REGISTRY }}/base-developer-image:arm64-ubi10-${{env.short_sha}} \
-              --amend ${{ env.REGISTRY }}/base-developer-image:ppc64le-ubi10-${{env.short_sha}}
-          
-            docker manifest annotate ${{ env.REGISTRY }}/base-developer-image:${tag} \
+            docker buildx imagetools create \
+              -t ${{ env.REGISTRY }}/base-developer-image:${tag} \
               ${{ env.REGISTRY }}/base-developer-image:amd64-ubi10-${{env.short_sha}} \
-              --os linux --arch amd64
-          
-            docker manifest annotate ${{ env.REGISTRY }}/base-developer-image:${tag} \
-               ${{ env.REGISTRY }}/base-developer-image:arm64-ubi10-${{env.short_sha}} \
-              --os linux --arch arm64
-            
-            docker manifest annotate ${{ env.REGISTRY }}/base-developer-image:${tag} \
-               ${{ env.REGISTRY }}/base-developer-image:ppc64le-ubi10-${{env.short_sha}} \
-              --os linux --arch ppc64le
-          
-            docker manifest push ${{ env.REGISTRY }}/base-developer-image:${tag}
+              ${{ env.REGISTRY }}/base-developer-image:arm64-ubi10-${{env.short_sha}} \
+              ${{ env.REGISTRY }}/base-developer-image:ppc64le-ubi10-${{env.short_sha}}
           done
 
   build-udi:
@@ -162,6 +149,8 @@ jobs:
     name: Publish udi
     runs-on: ubuntu-22.04
     needs: build-udi
+    outputs:
+      uniq_tag: ${{ steps.setTagName.outputs.uniq_tag }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -177,24 +166,11 @@ jobs:
         run: |
           for tag in ubi10-latest ubi10-${{env.short_sha}};
           do
-            docker manifest create ${{ env.REGISTRY }}/universal-developer-image:${tag} \
-              --amend ${{ env.REGISTRY }}/universal-developer-image:amd64-ubi10-${{env.short_sha}} \
-              --amend ${{ env.REGISTRY }}/universal-developer-image:arm64-ubi10-${{env.short_sha}} \
-              --amend ${{ env.REGISTRY }}/universal-developer-image:ppc64le-ubi10-${{env.short_sha}}
-          
-            docker manifest annotate ${{ env.REGISTRY }}/universal-developer-image:${tag} \
+            docker buildx imagetools create \
+              -t ${{ env.REGISTRY }}/universal-developer-image:${tag} \
               ${{ env.REGISTRY }}/universal-developer-image:amd64-ubi10-${{env.short_sha}} \
-              --os linux --arch amd64
-          
-            docker manifest annotate ${{ env.REGISTRY }}/universal-developer-image:${tag} \
-               ${{ env.REGISTRY }}/universal-developer-image:arm64-ubi10-${{env.short_sha}} \
-              --os linux --arch arm64
-            
-            docker manifest annotate ${{ env.REGISTRY }}/universal-developer-image:${tag} \
-               ${{ env.REGISTRY }}/universal-developer-image:ppc64le-ubi10-${{env.short_sha}} \
-              --os linux --arch ppc64le
-          
-            docker manifest push ${{ env.REGISTRY }}/universal-developer-image:${tag}
+              ${{ env.REGISTRY }}/universal-developer-image:arm64-ubi10-${{env.short_sha}} \
+              ${{ env.REGISTRY }}/universal-developer-image:ppc64le-ubi10-${{env.short_sha}}
           done
       - name: Get tag with uniq prefix
         id: setTagName
diff --git a/.github/workflows/ubi9-build.yaml b/.github/workflows/ubi9-build.yaml
