Merge branch 'feature/ghcr-in-parallel' into develop

driplineorg · Feb 29, 2024 · 9339ce7 · 9339ce7
2 parents f194bce + 1af06c7
commit 9339ce7
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -8,7 +8,8 @@ on:
   workflow_dispatch:
 
 env:
-  REGISTRY: docker.io
+  REGISTRY: ghcr.io
+  REGISTRY_OLD: docker.io
   BASE_IMAGE_REPO: python
   BASE_IMAGE_TAG: '3.8.7-buster'
 
@@ -152,7 +153,9 @@ jobs:
         id: docker_meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ github.repository }}
+          images: |
+            ${{ env.REGISTRY_OLD }}/${{ github.repository }}
+            ${{ env.REGISTRY }}/${{ github.repository }}
           flavor: |
             latest=auto
             suffix=${{ matrix.tag-suffix }},onlatest=true
@@ -174,12 +177,16 @@ jobs:
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ env.REGISTRY_OLD }}
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-#         for ghcr.io, use:
-#          username: ${{ github.actor }}
-#          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
         id: build_push