fix typo

equinor · Dec 12, 2024 · 33f6f57 · 33f6f57
1 parent 90d996f
commit 33f6f57
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
@@ -170,21 +170,28 @@ jobs:
         platforms: |
           linux/amd64
           linux/arm64
+      
 
-    # This steps reads the original manifest,
-    # fetches all the digests from the manifest,
-    # and builds a new for the target repository
+      # This steps reads the original manifest,
+      # fetches all the digests from the manifest,
+      # and builds a new for the target repository
     - name: Copy Operator image
+      env:
+        TARGETREPO: ${{ steps.metadata.outputs.operator }}
+        SOURCEREPO: ${{ needs.build-operator.outputs.fullname }}
       run: |
-        docker buildx imagetools inspect ${{ needs.build-operator.outputs.fullname }} --raw | \
-        jq '[.manifests[] | "${{ needs.build-operator.outputs.fullname }}@" + .digest] | join(" ")' -r | \
-        xargs docker buildx imagetools create -t ${{ steps.metadata.outputs.operator }}
+        docker buildx imagetools inspect $SOURCEREPO --raw > manifest.json
+        tags=$(jq '[.manifests[] | env.SOURCEREPO + "@" + .digest] | join(" ")' -r manifest.json)
+        echo $tags | xargs docker buildx imagetools create --progress=plain --tag $TARGETREPO
 
     - name: Copy Pipeline Runner image
+      env:
+        TARGETREPO: ${{ steps.metadata.outputs.pipeline }}
+        SOURCEREPO: ${{ needs.build-pipelinerunner.outputs.fullname }}
       run: |
-        docker buildx imagetools inspect ${{ needs.build-pipelinerunner.outputs.fullname }} --raw | \
-        jq '[.manifests[] | "${{ needs.build-pipelinerunner.outputs.fullname }}@" + .digest] | join(" ")' -r | \
-        xargsdocker buildx imagetools create -t ${{ steps.metadata.outputs.pipeline }}
+        docker buildx imagetools inspect $SOURCEREPO --raw > manifest.json
+        tags=$(jq '[.manifests[] | env.SOURCEREPO + "@" + .digest] | join(" ")' -r manifest.json)
+        echo $tags | xargs docker buildx imagetools create --progress=plain --tag $TARGETREPO
 
     - name: Revoke GitHub IP on ACR
       if: ${{ steps.update_firewall.outcome == 'success' && !cancelled()}} # Always run this step even if previous step failed