fix(Push): Fixes manifest build, test, push

- Fixes source images for generated meta data used by manifest creation.
ndigitals · Dec 14, 2023 · 4032667 · 4032667
1 parent 6f7b1cb
commit 4032667
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -164,13 +164,15 @@ jobs:
         uses: docker/metadata-action@v5
         id: metadata
         with:
-          images: ${{ env.REGISTRY }}/${{ env.OWNER }}/${{ env.PACKAGE }}
+          images: |
+              /tmp/${{ env.PACKAGE }}/amd64/${{ env.PACKAGE }}-php-${{ matrix.PHP_VERSION }}-node-${{ matrix.NODE_VERSION }}-oci.tar
+              /tmp/${{ env.PACKAGE }}/arm64/${{ env.PACKAGE }}-php-${{ matrix.PHP_VERSION }}-node-${{ matrix.NODE_VERSION }}-oci.tar
           tags: type=raw,value=php-${{ matrix.PHP_VERSION }}-node-${{ matrix.NODE_VERSION }}
 
       - name: Create Manifest List and Push
         working-directory: /tmp/${{ env.PACKAGE }}
         run: |
-            docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            docker buildx imagetools create $(jq -cr '.version | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(printf '${{ env.REGISTRY }}/${{ env.OWNER }}/${{ env.PACKAGE }}@sha256:%s ' *)
 
   release:

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
@@ -139,3 +139,19 @@ jobs:
         run: ls -R
         working-directory: /tmp/${{ env.PACKAGE }}
 
+      # https://github.com/marketplace/actions/docker-metadata-action
+      - name: Docker Metadata
+        uses: docker/metadata-action@v5
+        id: metadata
+        with:
+          images: |
+              /tmp/${{ env.PACKAGE }}/amd64/${{ env.PACKAGE }}-php-${{ matrix.PHP_VERSION }}-node-${{ matrix.NODE_VERSION }}-oci.tar
+              /tmp/${{ env.PACKAGE }}/arm64/${{ env.PACKAGE }}-php-${{ matrix.PHP_VERSION }}-node-${{ matrix.NODE_VERSION }}-oci.tar
+          tags: type=raw,value=php-${{ matrix.PHP_VERSION }}-node-${{ matrix.NODE_VERSION }}
+
+      - name: Inspect Manifest List
+        working-directory: /tmp/${{ env.PACKAGE }}
+        run: |
+            docker buildx imagetools inspect $(jq -cr '.tags | map(" " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ env.REGISTRY }}/${{ env.OWNER }}/${{ env.PACKAGE }}@sha256:%s ' *)
+