fix: Build artifacts

Author: actuarysailor

.github/workflows/build-image.yaml

@@ -16,8 +16,10 @@ jobs:
     permissions:
       # for docker/build-push-action to publish docker image
       packages: write
-
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        dockerfile: [Dockerfile, Dockerfile.tools]
     steps:
     - name: Checkout code
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
@@ -56,38 +58,21 @@ jobs:
       uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83  # v6.18.0
       with:
         context: .
+        file: ${{ matrix.dockerfile }}
         build-args: |
           INSTALL_ALL=true
         platforms: linux/amd64,linux/arm64
         push: true
         tags: |
-          ${{ env.IMAGE_REPO }}:${{ env.IMAGE_TAG }}
-          ${{ env.IMAGE_REPO }}:latest
-        # Fix multi-platform: https://github.com/docker/buildx/issues/1533
-        provenance: false
-        secrets: |
-          "github_token=${{ secrets.GITHUB_TOKEN }}"
-
-    - name: Build and Push tools release
-      if: github.event_name != 'schedule'
-      uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83  # v6.18.0
-      with:
-        context: .
-        file: ./Dockerfile.tools
-        build-args: |
-          BASE_IMAGE=${{ env.IMAGE_REPO }}:${{ env.IMAGE_TAG }}
-        platforms: linux/amd64,linux/arm64
-        push: true
-        tags: |
-          ${{ env.IMAGE_REPO }}-tools:${{ env.IMAGE_TAG }}
-          ${{ env.IMAGE_REPO }}-tools:latest
+          ${{ matrix.dockerfile == 'Dockerfile' && format('{0}:{1}', env.IMAGE_REPO, env.IMAGE_TAG) || format('{0}-tools:{1}', env.IMAGE_REPO, env.IMAGE_TAG) }}
+          ${{ matrix.dockerfile == 'Dockerfile' && format('{0}:latest', env.IMAGE_REPO) || format('{0}-tools:latest', env.IMAGE_REPO) }}
         # Fix multi-platform: https://github.com/docker/buildx/issues/1533
         provenance: false
         secrets: |
           "github_token=${{ secrets.GITHUB_TOKEN }}"
 
     - name: Test tools image
-      if: github.event_name != 'schedule'
+      if: matrix.dockerfile == 'Dockerfile.tools' && github.event_name != 'schedule'
       env:
         IMAGE_TAG: ${{ env.IMAGE_REPO }}-tools:${{ env.IMAGE_TAG }}
       run: |
@@ -103,6 +88,7 @@ jobs:
       uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83  # v6.18.0
       with:
         context: .
+        file: ${{ matrix.dockerfile }}
         build-args: |
           INSTALL_ALL=true
         platforms: linux/amd64,linux/arm64
@@ -113,20 +99,3 @@ jobs:
         provenance: false
         secrets: |
           "github_token=${{ secrets.GITHUB_TOKEN }}"
-
-    - name: Build and Push tools nightly
-      if: github.event_name == 'schedule'
-      uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83  # v6.18.0
-      with:
-        context: .
-        file: ./Dockerfile.tools
-        build-args: |
-          BASE_IMAGE=${{ env.IMAGE_REPO }}:nightly
-        platforms: linux/amd64,linux/arm64
-        push: true
-        tags: |
-          ${{ env.IMAGE_REPO }}-tools:nightly
-        # Fix multi-platform: https://github.com/docker/buildx/issues/1533
-        provenance: false
-        secrets: |
-          "github_token=${{ secrets.GITHUB_TOKEN }}"