[bug] Order docker registry logins in docker-dev.yml (#549)

* Swap image order in docker-dev.yml * Update docker-dev.yml --------- Co-authored-by: KCarretto <[email protected]>
spellshift · Feb 7, 2024 · 0853f37 · 0853f37
1 parent 3a88b54
commit 0853f37
Showing 1 changed file with 27 additions and 5 deletions.
diff --git a/.github/workflows/docker-dev.yml b/.github/workflows/docker-dev.yml
@@ -30,6 +30,29 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
+
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            spellshift/tavern
+          tags: |
+            type=ref,event=branch
+            type=edge,branch=main
+            type=sha,format=long
+
+      - name: Build and push Dockerhub image
+        uses: docker/build-push-action@v4
+        with:
+          file: ./docker/tavern.Dockerfile
+          context: .
+          push: true
+          target: production
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
       - name: Log in to the Container registry
         uses: docker/login-action@v2
         with:
@@ -38,23 +61,22 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
-        id: meta
+        id: meta_ghcr
         uses: docker/metadata-action@v4
         with:
           images: |
-            spellshift/tavern
             ${{ env.GHCR_REGISTRY }}/${{ env.GHCR_IMAGE_NAME }}
           tags: |
             type=ref,event=branch
             type=edge,branch=main
             type=sha,format=long
 
-      - name: Build and push Docker image
+      - name: Build and push GHCR image
         uses: docker/build-push-action@v4
         with:
           file: ./docker/tavern.Dockerfile
           context: .
           push: true
           target: production
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.meta_ghcr.outputs.tags }}
+          labels: ${{ steps.meta_ghcr.outputs.labels }}