Refactor docker workflow for better compatibility (#5)

- Change workflow name to "Publish Docker"
JBZoo · Mar 11, 2024 · 50d44ae · 50d44ae
1 parent 363806f
commit 50d44ae
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml
@@ -134,16 +134,16 @@ jobs:
         continue-on-error: true
 
   docker:
-    name: Docker
+    name: Docker Hub
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - name: 🐳 Building Docker Image
-        run: make build-docker
+      - name: Pull Docker Image
+        run: docker pull jbzoo/csv-blueprint
 
       - name: 👍 Valid CSV file
         run: |

diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml
@@ -10,27 +10,37 @@
 # @see        https://github.com/JBZoo/Csv-Blueprint
 #
 
-name: Publish Docker Image
+name: Publish Docker
 
 on:
   release:
     types: [ published ]
   push:
     branches:
       - 'master'
+  pull_request:
+    branches:
+      - "*"
 
 jobs:
   docker:
+    name: Docker
     runs-on: ubuntu-latest
     steps:
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      
+
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           push: true
-          tags: jbzoo/csv-blueprint:${{ env.GITHUB_REF_NAME }}
+          tags: jbzoo/csv-blueprint:latest