Use build and push

spack · May 28, 2024 · 7ad6970 · 7ad6970
1 parent fd7ea0c
commit 7ad6970
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 12 deletions.
diff --git a/.github/workflows/update-file.yml b/.github/workflows/update-file.yml
@@ -15,6 +15,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - name: Log in to the Container registry
         uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
         with:
@@ -31,10 +33,16 @@ jobs:
             type=sha
           flavor: |
             latest=true
-      - name: Docker Build
-        run: docker build -f Dockerfiles/file/Dockerfile.file -t ${{ steps.meta.outputs.tags }} --cache-from type=registry,ref=${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:latest --cache-from type=registry,ref=${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:main .
-      - name: Docker Push
-        run: docker push ${{ steps.meta.outputs.tags }}
+      - name: Docker Build and Push
+        uses: docker/build-push-action@v5
+        with:
+          file: Dockerfiles/file/Dockerfile.file
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          cache-from: |
+            type=registry,ref=${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:latest
+            type=registry,ref=${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:main
   push-file:
     runs-on: ubuntu-latest
     needs: [build-file]

diff --git a/.github/workflows/update-gpg.yml b/.github/workflows/update-gpg.yml
@@ -15,6 +15,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - name: Log in to the Container registry
         uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
         with:
@@ -31,10 +33,16 @@ jobs:
             type=sha
           flavor: |
             latest=true
-      - name: Docker Build
-        run: docker build -f Dockerfiles/gpg/Dockerfile.gpg -t ${{ steps.meta.outputs.tags }} --cache-from type=registry,ref=${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:latest --cache-from type=registry,ref=${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:main .
-      - name: Docker Push
-        run: docker push ${{ steps.meta.outputs.tags }}
+      - name: Docker Build and Push
+        uses: docker/build-push-action@v5
+        with:
+          file: Dockerfiles/gpg/Dockerfile.gpg
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          cache-from: |
+            type=registry,ref=${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:latest
+            type=registry,ref=${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:main
   push-gpg:
     runs-on: ubuntu-latest
     needs: [build-gpg]

diff --git a/.github/workflows/update-mingw.yml b/.github/workflows/update-mingw.yml
@@ -15,6 +15,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - name: Log in to the Container registry
         uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
         with:
@@ -31,10 +33,16 @@ jobs:
             type=sha
           flavor: |
             latest=true
-      - name: Docker Build
-        run: docker build -f Dockerfiles/mingw-w64/Dockerfile.mingw-w64 -t ${{ steps.meta.outputs.tags }} --cache-from type=registry,ref=${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:latest --cache-from type=registry,ref=${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:main .
-      - name: Docker Push
-        run: docker push ${{ steps.meta.outputs.tags }}
+      - name: Docker Build and Push
+        uses: docker/build-push-action@v5
+        with:
+          file: Dockerfiles/mingw-w64/Dockerfile.mingw-w64
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          cache-from: |
+            type=registry,ref=${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:latest
+            type=registry,ref=${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:main
 
   push-mingw-w64:
     runs-on: ubuntu-latest