Fix docker image build ci

Author: khakers

.github/workflows/docker-image.yml

@@ -48,36 +48,18 @@ jobs:
             type=sha
             # set latest tag for stable releases
             type=raw,value=latest,enable=${{ github.event.release.prerelease == false }}
-          bake-target: openmodmail
+          bake-target: docker-metadata-action
 
-      - name: Extract metadata (tags, labels) for Docker supportutils
-        id: docker-meta-supportutils
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          flavor: |
-            suffix=-supportutils,onlatest=true
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=ref,event=branch
-            type=ref,event=pr
-            type=sha
-            # set latest tag for stable releases
-            type=raw,value=latest,enable=${{ github.event.release.prerelease == false }}
-          bake-target: openmodmail-supportutils
-          
       - name: Build and push
         uses: docker/bake-action@v6
         with:
-          push: ${{ ! startsWith(github.ref, 'refs/pull/') }}
+#          source: .
+          push: ${{ ! startsWith(github.ref, 'refs/pull/') && ! github.event.act }}
           pull: true
           sbom: true
           files: |            
             ./docker-bake.hcl
             cwd://${{ steps.docker-meta-base.outputs.bake-file }}
-            cwd://${{ steps.docker-meta-supportutils.outputs.bake-file }}
-          targets: openmodmail,openmodmail-supportutils
+          targets: openmodmail
 
 

docker-bake.hcl

@@ -5,31 +5,24 @@ target "_common" {
   platforms = ["linux/amd64", "linux/arm64"]
 }
 
+# placeholder for docker-metadata-action target data
+target "docker-metadata-action" {
+  tags = []
+}
+
 target "openmodmail" {
-  name = "openmodmail${notequal("",INCLUDE_SUPPORTUTILS) ? "-supportutils" : ""}${notequal("",INCLUDE_PIP) ? "-pip"  : ""}"
-  inherits = ["_common"]
+  name = "openmodmail${notequal("true",include-supportutils) ? "" : "-supportutils"}${notequal("true",include-pip) ? "" : "-pip"}"
+  inherits = ["_common", "docker-metadata-action"]
   context    = "."
   dockerfile = "Dockerfile"
   matrix = {
-    INCLUDE_SUPPORTUTILS = ["true", ""]
-    INCLUDE_PIP          = ["true", ""]
+    include-supportutils = ["true", "false"]
+    include-pip          = ["true", "false"]
   }
+  args = {
+    INCLUDE_SUPPORTUTILS = include-supportutils
+    INCLUDE_PIP          = include-pip
+  }
+  # take the tags from the docker-metadata-action target and append the suffixes based on the matrix values
+  tags = [for tag in target.docker-metadata-action.tags : "${tag}${notequal("true",include-supportutils) ? "" : "-supportutils"}${notequal("true",include-pip) ? "" : "-pip"}"]
 }
-
-# target "openmodmail-supportutils" {
-#   inherits = ["_common"]
-#   context    = "."
-#   dockerfile = "Dockerfile"
-#   args = {
-#     INCLUDE_SUPPORTUTILS = "true"
-#   }
-# }
-#
-# target "openmodmail-pip" {
-#   inherits = ["_common"]
-#   context    = "."
-#   dockerfile = "Dockerfile"
-#   args = {
-#     INCLUDE_PIP = "true"
-#   }
-# }

mise.toml

@@ -1,3 +1,4 @@
 [tools]
+act = "latest"
 pdm = "latest"
 python = "3.12"