Fix manifest creation

Signed-off-by: Christian Haudum <[email protected]>
grafana · Jan 22, 2025 · 0fa49fe · 0fa49fe
1 parent f219647
commit 0fa49fe
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/.github/release-workflows.jsonnet b/.github/release-workflows.jsonnet
@@ -156,14 +156,14 @@ local weeklyImageJobs = {
           step.new('Publish multi-arch manifest')
           + step.withRun(|||
             # Unfortunately there is no better way atm than having a separate named output for each digest
-            echo '${{ needs.%(name)s.outputs.image_digest_linux_amd64 }}'
-            echo '${{ needs.%(name)s.outputs.image_digest_linux_arm64 }}'
-            echo '${{ needs.%(name)s.outputs.image_digest_linux_arm }}'
+            echo 'linux/arm64 ${{ needs.%(name)s.outputs.image_digest_linux_amd64 }}'
+            echo 'linux/amd64 ${{ needs.%(name)s.outputs.image_digest_linux_arm64 }}'
+            echo 'linux/arm   ${{ needs.%(name)s.outputs.image_digest_linux_arm }}'
             IMAGE=${{ needs.%(name)s.outputs.image_name }}:${{ needs.%(name)s.outputs.image_tag }}
-            echo "IMAGE=$IMAGE"
+            echo "Create multi-arch manifest for $IMAGE"
             docker buildx imagetools create -t $IMAGE \
               ${{ needs.%(name)s.outputs.image_name }}@${{ needs.%(name)s.outputs.image_digest_linux_amd64 }} \
-              ${{ needs.%(name)s.outputs.image_name }}@${{ needs.%(name)s.outputs.image_digest_linux_arm64 }}
+              ${{ needs.%(name)s.outputs.image_name }}@${{ needs.%(name)s.outputs.image_digest_linux_arm64 }} \
               ${{ needs.%(name)s.outputs.image_name }}@${{ needs.%(name)s.outputs.image_digest_linux_arm }}
             docker buildx imagetools inspect $IMAGE
           ||| % { name: '%s-image' % name }),

diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml
@@ -95,14 +95,14 @@
     - "name": "Publish multi-arch manifest"
       "run": |
         # Unfortunately there is no better way atm than having a separate named output for each digest
-        echo '${{ needs.loki-canary-boringcrypto-image.outputs.image_digest_linux_amd64 }}'
-        echo '${{ needs.loki-canary-boringcrypto-image.outputs.image_digest_linux_arm64 }}'
-        echo '${{ needs.loki-canary-boringcrypto-image.outputs.image_digest_linux_arm }}'
+        echo 'linux/arm64 ${{ needs.loki-canary-boringcrypto-image.outputs.image_digest_linux_amd64 }}'
+        echo 'linux/amd64 ${{ needs.loki-canary-boringcrypto-image.outputs.image_digest_linux_arm64 }}'
+        echo 'linux/arm   ${{ needs.loki-canary-boringcrypto-image.outputs.image_digest_linux_arm }}'
         IMAGE=${{ needs.loki-canary-boringcrypto-image.outputs.image_name }}:${{ needs.loki-canary-boringcrypto-image.outputs.image_tag }}
-        echo "IMAGE=$IMAGE"
+        echo "Create multi-arch manifest for $IMAGE"
         docker buildx imagetools create -t $IMAGE \
           ${{ needs.loki-canary-boringcrypto-image.outputs.image_name }}@${{ needs.loki-canary-boringcrypto-image.outputs.image_digest_linux_amd64 }} \
-          ${{ needs.loki-canary-boringcrypto-image.outputs.image_name }}@${{ needs.loki-canary-boringcrypto-image.outputs.image_digest_linux_arm64 }}
+          ${{ needs.loki-canary-boringcrypto-image.outputs.image_name }}@${{ needs.loki-canary-boringcrypto-image.outputs.image_digest_linux_arm64 }} \
           ${{ needs.loki-canary-boringcrypto-image.outputs.image_name }}@${{ needs.loki-canary-boringcrypto-image.outputs.image_digest_linux_arm }}
         docker buildx imagetools inspect $IMAGE
   "loki-canary-image":
@@ -201,14 +201,14 @@
     - "name": "Publish multi-arch manifest"
       "run": |
         # Unfortunately there is no better way atm than having a separate named output for each digest
-        echo '${{ needs.loki-canary-image.outputs.image_digest_linux_amd64 }}'
-        echo '${{ needs.loki-canary-image.outputs.image_digest_linux_arm64 }}'
-        echo '${{ needs.loki-canary-image.outputs.image_digest_linux_arm }}'
+        echo 'linux/arm64 ${{ needs.loki-canary-image.outputs.image_digest_linux_amd64 }}'
+        echo 'linux/amd64 ${{ needs.loki-canary-image.outputs.image_digest_linux_arm64 }}'
+        echo 'linux/arm   ${{ needs.loki-canary-image.outputs.image_digest_linux_arm }}'
         IMAGE=${{ needs.loki-canary-image.outputs.image_name }}:${{ needs.loki-canary-image.outputs.image_tag }}
-        echo "IMAGE=$IMAGE"
+        echo "Create multi-arch manifest for $IMAGE"
         docker buildx imagetools create -t $IMAGE \
           ${{ needs.loki-canary-image.outputs.image_name }}@${{ needs.loki-canary-image.outputs.image_digest_linux_amd64 }} \
-          ${{ needs.loki-canary-image.outputs.image_name }}@${{ needs.loki-canary-image.outputs.image_digest_linux_arm64 }}
+          ${{ needs.loki-canary-image.outputs.image_name }}@${{ needs.loki-canary-image.outputs.image_digest_linux_arm64 }} \
           ${{ needs.loki-canary-image.outputs.image_name }}@${{ needs.loki-canary-image.outputs.image_digest_linux_arm }}
         docker buildx imagetools inspect $IMAGE
   "loki-image":
@@ -307,14 +307,14 @@
     - "name": "Publish multi-arch manifest"
       "run": |
         # Unfortunately there is no better way atm than having a separate named output for each digest
-        echo '${{ needs.loki-image.outputs.image_digest_linux_amd64 }}'
-        echo '${{ needs.loki-image.outputs.image_digest_linux_arm64 }}'
-        echo '${{ needs.loki-image.outputs.image_digest_linux_arm }}'
+        echo 'linux/arm64 ${{ needs.loki-image.outputs.image_digest_linux_amd64 }}'
+        echo 'linux/amd64 ${{ needs.loki-image.outputs.image_digest_linux_arm64 }}'
+        echo 'linux/arm   ${{ needs.loki-image.outputs.image_digest_linux_arm }}'
         IMAGE=${{ needs.loki-image.outputs.image_name }}:${{ needs.loki-image.outputs.image_tag }}
-        echo "IMAGE=$IMAGE"
+        echo "Create multi-arch manifest for $IMAGE"
         docker buildx imagetools create -t $IMAGE \
           ${{ needs.loki-image.outputs.image_name }}@${{ needs.loki-image.outputs.image_digest_linux_amd64 }} \
-          ${{ needs.loki-image.outputs.image_name }}@${{ needs.loki-image.outputs.image_digest_linux_arm64 }}
+          ${{ needs.loki-image.outputs.image_name }}@${{ needs.loki-image.outputs.image_digest_linux_arm64 }} \
           ${{ needs.loki-image.outputs.image_name }}@${{ needs.loki-image.outputs.image_digest_linux_arm }}
         docker buildx imagetools inspect $IMAGE
   "promtail-image":
@@ -413,14 +413,14 @@
     - "name": "Publish multi-arch manifest"
       "run": |
         # Unfortunately there is no better way atm than having a separate named output for each digest
-        echo '${{ needs.promtail-image.outputs.image_digest_linux_amd64 }}'
-        echo '${{ needs.promtail-image.outputs.image_digest_linux_arm64 }}'
-        echo '${{ needs.promtail-image.outputs.image_digest_linux_arm }}'
+        echo 'linux/arm64 ${{ needs.promtail-image.outputs.image_digest_linux_amd64 }}'
+        echo 'linux/amd64 ${{ needs.promtail-image.outputs.image_digest_linux_arm64 }}'
+        echo 'linux/arm   ${{ needs.promtail-image.outputs.image_digest_linux_arm }}'
         IMAGE=${{ needs.promtail-image.outputs.image_name }}:${{ needs.promtail-image.outputs.image_tag }}
-        echo "IMAGE=$IMAGE"
+        echo "Create multi-arch manifest for $IMAGE"
         docker buildx imagetools create -t $IMAGE \
           ${{ needs.promtail-image.outputs.image_name }}@${{ needs.promtail-image.outputs.image_digest_linux_amd64 }} \
-          ${{ needs.promtail-image.outputs.image_name }}@${{ needs.promtail-image.outputs.image_digest_linux_arm64 }}
+          ${{ needs.promtail-image.outputs.image_name }}@${{ needs.promtail-image.outputs.image_digest_linux_arm64 }} \
           ${{ needs.promtail-image.outputs.image_name }}@${{ needs.promtail-image.outputs.image_digest_linux_arm }}
         docker buildx imagetools inspect $IMAGE
 "name": "Publish images"