Merge pull request #19 from BWibo/fix-docker-workflow

Fix docker workflow

Author: BWibo

.github/workflows/docker-build-push-edge.yml

@@ -7,16 +7,12 @@ on:
       - main
 env:
   IMAGE_NAME: citydb-tool
+  PLATFORMS: linux/amd64,linux/arm64
 
 jobs:
   build-push:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        platform:
-          - linux/amd64
-          - linux/arm64
+
     steps:
     -
       name: Parse short sha
@@ -49,10 +45,12 @@ jobs:
       name: Set up QEMU
       uses: docker/setup-qemu-action@v3
       with:
-        platforms: ${{ matrix.platform }}
+        platforms: ${{ env.PLATFORMS }}
     -
       name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
+      with:
+        platforms: ${{ env.PLATFORMS }}
     -
       name: Extract metadata (tags, labels) for docker image
       id: meta
@@ -84,7 +82,7 @@ jobs:
         push: true
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
-        platforms: ${{ matrix.platform }}
+        platforms: ${{ env.PLATFORMS }}
         build-args: |
           CITYDB_TOOL_VERSION=${{ steps.short-sha.outputs.sha }}
     -

.github/workflows/docker-build-push-release.yml

@@ -6,16 +6,12 @@ on:
     types: [published, edited]
 env:
   IMAGE_NAME: citydb-tool
+  PLATFORMS: linux/amd64,linux/arm64
 
 jobs:
   build-push:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        platform:
-          - linux/amd64
-          - linux/arm64
+
     steps:
     -
       name: Get release version without v
@@ -48,10 +44,12 @@ jobs:
       name: Set up QEMU
       uses: docker/setup-qemu-action@v3
       with:
-        platforms: ${{ matrix.platform }}
+        platforms: ${{ env.PLATFORMS }}
     -
       name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
+      with:
+        platforms: ${{ env.PLATFORMS }}
     -
       name: Extract metadata (tags, labels) for docker image
       id: meta
@@ -83,7 +81,7 @@ jobs:
         push: true
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
-        platforms: ${{ matrix.platform }}
+        platforms: ${{ env.PLATFORMS }}
         build-args: |
           CITYDB_TOOL_VERSION=${{ steps.release_version.outputs.version }}
     -