cleanup and add comments

FoxxMD · Dec 27, 2024 · bcbb643 · bcbb643
1 parent 2a63107
commit bcbb643
Showing 1 changed file with 9 additions and 21 deletions.
diff --git a/.github/workflows/publishImage.yml b/.github/workflows/publishImage.yml
@@ -54,6 +54,8 @@ jobs:
           platform=${{ matrix.platform }}
           echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV     
 
+          # list all registries to push to and join all non-empty with comma
+          # https://unix.stackexchange.com/a/693165/116849
           strings=("${{vars.DOCKERHUB_SLUG}}" "${{vars.GHCR_SLUG}}")
           for i in ${!strings[@]}; do [[ -z ${strings[i]} ]] && unset strings[i]; done
           joined_string=$(IFS=, ; echo "${strings[*]}")
@@ -120,8 +122,6 @@ jobs:
             APP_BUILD_VERSION=${{steps.appversion.outputs.appversion}}
           platforms: ${{ matrix.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          #tags: ${{ steps.meta.outputs.tags }}
-          #outputs: type=image,"name=${{ env.DOCKERHUB_SLUG }},${{ env.GHCR_SLUG }}",push-by-digest=true,name-canonical=true,push=true
           outputs: type=image,"name=${{ env.REGISTRIES_JOINED }}",push-by-digest=true,name-canonical=true,push=true
           #cache-from: type=gha,scope=build-${{ env.PLATFORM_PAIR }}
           #cache-to: type=gha,scope=build-${{ env.PLATFORM_PAIR }}
@@ -176,7 +176,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Extract metadata (tags, labels) for Docker
+      - name: Extract metadata (tags, labels)
         id: meta
         uses: docker/metadata-action@v5
         with:
@@ -203,38 +203,26 @@ jobs:
             org.opencontainers.image.description=Scrobble from many sources to many clients
             org.opencontainers.image.vendor=FoxxMD
       
-      - name: Create manifest list and push
+      - name: Create manifest list and push dockerhub
         if: ${{ vars.DOCKERHUB_SLUG != '' }}
         working-directory: /tmp/digests
         run: |
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             $(printf '${{ vars.DOCKERHUB_SLUG }}@sha256:%s ' *)
       
-      - name: Create manifest list and push
+      - name: Create manifest list and push gchr
         if: ${{ vars.GHCR_SLUG != '' }}
         working-directory: /tmp/digests
         run: |
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ vars.GHCR_SLUG }}@sha256:%s ' *)
-      # - name: Create manifest list and push
-      #   working-directory: /tmp/digests
-      #   run: |
-      #     docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-      #       $(printf '${{ env.DOCKERHUB_SLUG }}@sha256:%s ' *)
-      #     docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-      #       $(printf '${{ env.GHCR_SLUG }}@sha256:%s ' *)        
+            $(printf '${{ vars.GHCR_SLUG }}@sha256:%s ' *)    
       
-      - name: Inspect image
+      - name: Inspect image dockerhub
         if: ${{ vars.DOCKERHUB_SLUG != '' }}
         run: |
           docker buildx imagetools inspect ${{ vars.DOCKERHUB_SLUG }}:${{ steps.meta.outputs.version }}
 
-      - name: Inspect image
+      - name: Inspect image ghcr
         if: ${{ vars.GHCR_SLUG != '' }}
         run: |
-            docker buildx imagetools inspect ${{ vars.GHCR_SLUG }}:${{ steps.meta.outputs.version }}
-            
-      # - name: Inspect image
-      #   run: |
-      #     docker buildx imagetools inspect ${{ env.DOCKERHUB_SLUG }}:${{ steps.meta.outputs.version }}
-      #     docker buildx imagetools inspect ${{ env.GHCR_SLUG }}:${{ steps.meta.outputs.version }}      
+            docker buildx imagetools inspect ${{ vars.GHCR_SLUG }}:${{ steps.meta.outputs.version }}