add back bake

Author: Erisa

.github/workflows/docker-build.yml

@@ -2,8 +2,7 @@ name: docker-build
 
 on:
   push:
-    branches:
-      - main
+  pull_request:
 
 jobs:
   multi-arch-push:
@@ -12,19 +11,9 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      -
-        name: Cache Docker layers
-        uses: actions/cache@v4
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
       - 
         name: Login to GitHub Registry
         uses: docker/login-action@v3
@@ -39,21 +28,12 @@ jobs:
           username: erisamoe
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
-         name: Get Latest Tag
-         id: previoustag
-         uses: WyriHaximus/github-action-get-previous-tag@04e8485ecb6487243907e330d522ff60f02283ce # [email protected]
-      -
-        name: Build and push
-        uses: docker/build-push-action@v5
+        name: Bake image
+        uses: docker/bake-action@v6
+        env:
+          MULTI_PLATFORM: true
         with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6,linux/s390x,linux/ppc64le,linux/riscv64
-          push: true
-          tags: |
-            erisamoe/cloudflared:latest
-            erisamoe/cloudflared:${{ steps.previoustag.outputs.tag }}
-            ghcr.io/erisa/cloudflared:latest
-            ghcr.io/erisa/cloudflared:${{ steps.previoustag.outputs.tag }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
+          push: ${{ github.ref == 'refs/heads/main' }}
+          set: |
+            *.cache-from=type=gha
+            *.cache-to=type=gha,mode=max

docker-bake.hcl

@@ -0,0 +1,43 @@
+variable "CLOUDFLARED_VERSION" {
+    default = "2025.4.2"
+}
+
+variable "LATEST" {
+    default = true
+}
+
+variable "MULTI_PLATFORM" {
+    default = false
+}
+
+variable "GOVERSION" {
+    default = "1.23.9"
+}
+
+variable "ALPINEVERSION" {
+    default = "3.21"
+}
+
+target "default" {
+    args = {
+        VERSION = CLOUDFLARED_VERSION
+        GOVERSION = GOVERSION
+        ALPINEVERSION = ALPINEVERSION
+    }
+    platforms = !MULTI_PLATFORM ? null : [
+        "linux/amd64",
+        "linux/386",
+        "linux/arm64",
+        "linux/arm/v7",
+        "linux/arm/v6",
+        "linux/s390x",
+        "linux/ppc64le",
+        "linux/riscv64"
+    ]
+    tags = [
+        "erisamoe/cloudflared:${CLOUDFLARED_VERSION}",
+        "ghcr.io/erisa/cloudflared:${CLOUDFLARED_VERSION}",
+        LATEST ? "erisamoe/cloudflared:latest" : "",
+        LATEST ? "ghcr.io/erisa/cloudflared:latest" : "",
+    ]
+}