chore: simplify image list maker

estkme-group · Jun 22, 2024 · 47a8703 · 47a8703
1 parent 4522991
commit 47a8703
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml
@@ -43,6 +43,8 @@ jobs:
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
+        id: ghcr
+        continue-on-error: true
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -55,20 +57,13 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Make image list
-        id: images
-        run: |
-          echo 'images<<EOF' >> "$GITHUB_OUTPUT"
-          echo 'ghcr.io/${{ github.repository }}' >> "$GITHUB_OUTPUT"
-          if ${{ steps.dockerhub.outcome == 'success' }}; then
-            echo 'docker.io/${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}' >> "$GITHUB_OUTPUT"
-          fi
-          echo 'EOF' >> "$GITHUB_OUTPUT"
       - name: Metadata
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ steps.images.outputs.images }}
+          images: |
+            ghcr.io/${{ github.repository }},enable=${{ steps.ghcr.outcome == 'success' }}
+            docker.io/${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }},enable=${{ steps.dockerhub.outcome == 'success' }}
           tags: |
             type=raw,value=latest,enable={{is_default_branch}}
             type=semver,pattern={{version}}