Merge pull request #25 from ToshY/feature/24

Use GHCR
ToshY · Sep 5, 2024 · 6ec87b4 · 6ec87b4
2 parents c7f833b + 790bb4e
commit 6ec87b4
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -37,9 +37,17 @@ jobs:
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
+          registry: docker.io
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Change PHP version to 8.2
         if: github.event.schedule == '30 2 1,15 * *'
         run: |
@@ -69,7 +77,9 @@ jobs:
         id: meta_bookworm
         uses: docker/metadata-action@v5
         with:
-          images: t0shy/phpfpm-bookworm
+          images: |
+            docker.io/t0shy/phpfpm-bookworm
+            ghcr.io/toshy/phpfpm-bookworm
           tags: |
             type=raw,value=latest,enable=${{ steps.phpversion.outputs.enable_major_latest_version }}
             type=raw,value=${{ steps.phpversion.outputs.version_major }},enable=${{ steps.phpversion.outputs.enable_major_latest_version }}
@@ -92,7 +102,9 @@ jobs:
         id: meta_bookworm_ffmpeg
         uses: docker/metadata-action@v5
         with:
-          images: t0shy/phpfpm-bookworm-ffmpeg
+          images: |
+            docker.io/t0shy/phpfpm-bookworm-ffmpeg
+            ghcr.io/toshy/phpfpm-bookworm-ffmpeg
           tags: |
             type=raw,value=latest,enable=${{ steps.phpversion.outputs.enable_major_latest_version }}
             type=raw,value=${{ steps.phpversion.outputs.version_major }},enable=${{ steps.phpversion.outputs.enable_major_latest_version }}