Experimental possible simplification (probably wont work)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
pi-hole · Jun 19, 2023 · 7256b28 · 7256b28
1 parent 91f18c5
commit 7256b28
Showing 1 changed file with 20 additions and 21 deletions.
diff --git a/.github/workflows/v6-alpine-play.yml b/.github/workflows/v6-alpine-play.yml
@@ -67,7 +67,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: Build container and push by digest (Docker Hub)
-        id: build_docker
+        id: build
         uses: docker/build-push-action@v3
         with:
           context: ./src/
@@ -79,27 +79,26 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           outputs: |
             type=image,name=${{ env.DOCKER_REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
-      - name: Build container and push by digest (GitHub Container Registry)
-        id: build_ghcr
-        uses: docker/build-push-action@v3
-        with:
-          context: ./src/
-          platforms: ${{ matrix.platform }}
-          build-args: |
-            PIHOLE_DOCKER_TAG=${{ steps.meta.outputs.version }}
-            CONTAINER=${{ matrix.container }}
-          push: true
-          labels: ${{ steps.meta.outputs.labels }}
-          outputs: |
             type=image,name=${{ env.GITHUB_REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
+      # - name: Build container and push by digest (GitHub Container Registry)
+      #   id: build_ghcr
+      #   uses: docker/build-push-action@v3
+      #   with:
+      #     context: ./src/
+      #     platforms: ${{ matrix.platform }}
+      #     build-args: |
+      #       PIHOLE_DOCKER_TAG=${{ steps.meta.outputs.version }}
+      #       CONTAINER=${{ matrix.container }}
+      #     push: true
+      #     labels: ${{ steps.meta.outputs.labels }}
+      #     outputs: |
+      #       type=image,name=${{ env.GITHUB_REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
       - name: Export digests
         run: |
-          mkdir -p /tmp/digests/dockerhub/${{ env.context }}
-          mkdir -p /tmp/digests/ghcr/${{ env.context }}
-          digest_docker="${{ steps.build_docker.outputs.digest }}"
-          touch "/tmp/digests/dockerhub/${{ env.context }}/${digest_docker#sha256:}"
-          digest_ghcr="${{ steps.build_ghcr.outputs.digest }}"
-          touch "/tmp/digests/ghcr/${{ env.context }}/${digest_ghcr#sha256:}"
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
       - name: Upload digest
         uses: actions/upload-artifact@v3
         with:
@@ -146,7 +145,7 @@ jobs:
             v6-alpine-play
 
       - name: Create manifest list and push
-        working-directory: /tmp/digests/dockerhub
+        working-directory: /tmp/digests
         run: |
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(printf '${{ env.DOCKER_REGISTRY_IMAGE }}@sha256:%s ' *)
@@ -156,7 +155,7 @@ jobs:
           docker buildx imagetools inspect ${{ env.DOCKER_REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
 
       - name: Create manifest list and push
-        working-directory: /tmp/digests/ghcr
+        working-directory: /tmp/digests
         run: |
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(printf '${{ env.GITHUB_REGISTRY_IMAGE }}@sha256:%s ' *)