Merge pull request #161 from hunghvu/development

fix: attempt to correct misconfiguration of multi-registry build and …
hunghvu · Apr 21, 2024 · 00ebd0e · 00ebd0e
2 parents d007ef1 + 26b94d8
commit 00ebd0e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/.github/workflows/build-and-push-caddy.yaml b/.github/workflows/build-and-push-caddy.yaml
@@ -8,13 +8,6 @@ on:
 jobs:
   build-and-publish:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - dockerfile: ./infras/containers/caddy/Dockerfile
-          - image: |
-              docker.io/hunghvu/blogfolio-caddy
-              ghcr.io/hunghvu/blogfolio-caddy
     permissions:
       contents: read
       packages: write
@@ -48,7 +41,9 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ matrix.image }}
+          images: |
+              docker.io/hunghvu/blogfolio-caddy
+              ghcr.io/hunghvu/blogfolio-caddy
 
       # If we want to reference a subdir
       # https://github.com/docker/build-push-action/issues/528
@@ -57,7 +52,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ${{ matrix.dockerfile }}
+          file: ./infras/containers/caddy/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

diff --git a/.github/workflows/build-and-push-cms.yaml b/.github/workflows/build-and-push-cms.yaml
@@ -48,7 +48,9 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ matrix.image }}
+          images: |
+              docker.io/hunghvu/blogfolio-caddy
+              ghcr.io/hunghvu/blogfolio-caddy
 
       # If we want to reference a subdir
       # https://github.com/docker/build-push-action/issues/528
@@ -57,7 +59,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ${{ matrix.dockerfile }}
+          file: ./infras/containers/caddy/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

diff --git a/.github/workflows/build-and-push-web.yaml b/.github/workflows/build-and-push-web.yaml
@@ -48,7 +48,9 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ matrix.image }}
+          images: |
+              docker.io/hunghvu/blogfolio-caddy
+              ghcr.io/hunghvu/blogfolio-caddy
 
       # If we want to reference a subdir
       # https://github.com/docker/build-push-action/issues/528
@@ -57,7 +59,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ${{ matrix.dockerfile }}
+          file: ./infras/containers/caddy/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}