dasd

Author: douyun-dtyq

.github/workflows/build.yml

@@ -18,7 +18,6 @@ on:
 env:
   TRY_MIRRORS: ""
   PUBLIC_MIRROR: "https://dl-cdn.alpinelinux.org" # no mirror needed at github actions
-  IMAGE_NAME: php-dockerfile # only used for default local image name
 
 jobs:
   prepare:
@@ -93,8 +92,8 @@ jobs:
           if "${{ secrets.AWS_ECR_CRED }}":
             images.append("${{ inputs.awsEcrImageName }}" or "public.ecr.aws/${{ github.repository }}")
 
-          serialized = json.dumps(images)
-          githubOutput.write(f"images={serialized}\n")
+          imagesString = " ".join(images)
+          githubOutput.write(f"images={imagesString}\n")
 
           githubOutput.close()
 
@@ -171,47 +170,20 @@ jobs:
         shell: bash
         id: build
         run: |
-          GITHUB_TOKEN="${{ github.token }}" ./build.py "${{ matrix.tag }}"
-
-          # push single arch image
-          if [ "$(uname -m)" = "x86_64" ]; then
-            DOCKER_ARCH="amd64"
-          elif [ "$(uname -m)" = "aarch64" ]; then
-            DOCKER_ARCH="arm64"
-          else
-            echo "unknown architecture: $(uname -m)"
-            exit 1
-          fi
-
-          IMAGE="${{ inputs.ghcrImageName || format('ghcr.io/{0}', github.repository) }}"
-          docker tag "${IMAGE_NAME}:${{ matrix.tag }}" "${IMAGE}:${{ matrix.tag }}-${DOCKER_ARCH}"
-          docker tag "${IMAGE_NAME}:${{ matrix.tag }}-debuggable" "${IMAGE}:${{ matrix.tag }}-debuggable-${DOCKER_ARCH}"
-          docker push "${IMAGE}:${{ matrix.tag }}-${DOCKER_ARCH}"
-          docker push "${IMAGE}:${{ matrix.tag }}-debuggable-${DOCKER_ARCH}"
-
-          digest=$(docker inspect "${IMAGE}:${{ matrix.tag }}-${DOCKER_ARCH}" | jq -r '.[0].RepoDigests[0]')
-          digest="${digest#*@}"
+          GITHUB_TOKEN="${{ github.token }}" \
+            ./build.py "${{ matrix.tag }}" \
+              ${{ needs.prepare.outputs.images }} \
+              --oci \
+              --arch-suffix \
+              --gen-metadata \
+              --push
+
+          digest=$(jq -r '.[0].RepoDigests[0]' metadata_stripped.json)
           echo "stripped_digest=${digest}" >> "${GITHUB_OUTPUT}"
 
-          digest=$(docker inspect "${IMAGE}:${{ matrix.tag }}-debuggable-${DOCKER_ARCH}" | jq -r '.[0].RepoDigests[0]')
-          digest="${digest#*@}"
+          digest=$(jq -r '.[0].RepoDigests[0]' metadata_debuggable.json)
           echo "debuggable_digest=${digest}" >> "${GITHUB_OUTPUT}"
 
-          if [ -n "${{ steps.set-secrets.outputs.has_dockerhub }}" ]; then
-            IMAGE="${{ inputs.ghcrImageName || format('index.docker.io/{0}', github.repository) }}"
-            docker tag "${IMAGE_NAME}:${{ matrix.tag }}" "${IMAGE}:${{ matrix.tag }}-${DOCKER_ARCH}"
-            docker tag "${IMAGE_NAME}:${{ matrix.tag }}-debuggable" "${IMAGE}:${{ matrix.tag }}-debuggable-${DOCKER_ARCH}"
-            docker push "${IMAGE}:${{ matrix.tag }}-${DOCKER_ARCH}"
-            docker push "${IMAGE}:${{ matrix.tag }}-debuggable-${DOCKER_ARCH}"
-          fi
-          if [ -n "${{ steps.set-secrets.outputs.has_aws_ecr }}" ]; then
-            IMAGE="${{ inputs.awsEcrImageName || format('public.ecr.aws/{0}', github.repository) }}"
-            docker tag "${IMAGE_NAME}:${{ matrix.tag }}" "${IMAGE}:${{ matrix.tag }}-${DOCKER_ARCH}"
-            docker tag "${IMAGE_NAME}:${{ matrix.tag }}-debuggable" "${IMAGE}:${{ matrix.tag }}-debuggable-${DOCKER_ARCH}"
-            docker push "${IMAGE}:${{ matrix.tag }}-${DOCKER_ARCH}"
-            docker push "${IMAGE}:${{ matrix.tag }}-debuggable-${DOCKER_ARCH}"
-          fi
-
       - name: Generate provenance attestation for stripped image at ghcr.io
         uses: actions/attest-build-provenance@v2
         id: attest-stripped-ghcr
@@ -270,6 +242,6 @@ jobs:
         run: |
           ./.github/workflows/mergeimages.py \
             '${{ matrix.tag }}' \
-            '${{ needs.prepare.outputs.images }}' \
             '${{ steps.build.outputs.stripped_digest }}' \
-            '${{ steps.build.outputs.debuggable_digest }}'
+            '${{ steps.build.outputs.debuggable_digest }}' \
+            ${{ needs.prepare.outputs.images }}