Update docker.yml

wdhdev · Oct 9, 2024 · 6c227d9 · 6c227d9
1 parent b3c7377
commit 6c227d9
Showing 1 changed file with 19 additions and 11 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -11,8 +11,10 @@ concurrency:
     cancel-in-progress: true
 
 env:
-    REGISTRY: ghcr.io
-    IMAGE_NAME: ${{ github.repository }}
+    DOCKER_IMAGE_NAME: ${{ secrets.DOCKER_USERNAME }}/${{ github.event.repository.name }}
+    DOCKER_REGISTRY: docker.io
+    GITHUB_IMAGE_NAME: ${{ github.repository }}
+    GITHUB_REGISTRY: ghcr.io
 
 jobs:
     build-and-deploy:
@@ -22,23 +24,29 @@ jobs:
         steps:
             - uses: actions/checkout@v4
 
-            - name: Login to Registry
+            - name: Login to ${{ env.DOCKER_REGISTRY }}
               uses: docker/login-action@v3
               with:
-                  registry: ${{ env.REGISTRY }}
+                  registry: ${{ env.DOCKER_REGISTRY }}
+                  username: ${{ secrets.DOCKER_USERNAME }}
+                  password: ${{ secrets.DOCKER_PASSWORD }}
+
+            - name: Login to ${{ env.GITHUB_REGISTRY }}
+              uses: docker/login-action@v3
+              with:
+                  registry: ${{ env.GITHUB_REGISTRY }}
                   username: ${{ github.actor }}
                   password: ${{ secrets.GITHUB_TOKEN }}
 
-            - name: Extract Metadata
-              id: meta
-              uses: docker/metadata-action@v5
-              with:
-                  images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+            - run: echo "${{ github.ref_name }}"
 
             - name: Build and Push Image
               uses: docker/build-push-action@v6
               with:
                   context: .
                   push: true
-                  tags: ${{ steps.meta.outputs.tags }}
-                  labels: ${{ steps.meta.outputs.labels }}
+                  tags: |
+                      ${{ env.DOCKER_IMAGE_NAME }}:latest
+                      ${{ env.DOCKER_IMAGE_NAME }}:${{ github.ref_name }}
+                      ${{ env.GITHUB_REGISTRY }}/${{ env.GITHUB_IMAGE_NAME }}
+                      ${{ env.GITHUB_REGISTRY }}/${{ env.GITHUB_IMAGE_NAME }}:${{ github.ref_name }}