switch to 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,24 @@ jobs:
           username: erisamoe
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
-         name: Get Latest Tag
-         id: previoustag
-         uses: WyriHaximus/github-action-get-previous-tag@04e8485ecb6487243907e330d522ff60f02283ce # [email protected]
-      -
+        if: github.ref == 'ref/heads/main'
         name: Build and push
-        uses: docker/build-push-action@v5
+        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
+        set: |
+          *.cache-from=type=registry,ref=user/app:latest
+          *.cache-to=type=inline
+      -
+        if: github.ref != 'ref/heads/main'
+        name: Build test image
+        uses: docker/bake-action@v6
+        env:
+          MULTI_PLATFORM: true
+        with:
+          push: false
+        set: |
+          *.cache-from=type=registry,ref=user/app:latest
+          *.cache-to=type=inline

Dockerfile

@@ -1,6 +1,6 @@
 # Build container
-ARG GOVERSION=1.23.8
-ARG ALPINEVERSION=3.21
+ARG GOVERSION=1.23
+ARG ALPINEVERSION
 
 FROM --platform=${BUILDPLATFORM} \
     golang:$GOVERSION-alpine${ALPINEVERSION} AS build
@@ -11,7 +11,7 @@ RUN apk --no-cache add git build-base bash
 ENV GO111MODULE=on \
     CGO_ENABLED=0
 
-ARG VERSION=2025.4.2
+ARG VERSION
 RUN git clone https://github.com/cloudflare/cloudflared --depth=1 --branch ${VERSION} .
 RUN bash -x .teamcity/install-cloudflare-go.sh
 

docker-bake.hcl

@@ -0,0 +1,36 @@
+variable "CLOUDFLARED_VERSION" {
+    default = "2025.4.2"
+}
+
+variable "LATEST" {
+    default = true
+}
+
+variable "MULTI_PLATFORM" {
+    default = false
+}
+
+target "default" {
+    target = "build"
+    args = {
+        VERSION = "${CLOUDFLARED_VERSION}"
+        GOVERSION = "1.23.9"
+        ALPINEVERSION = "3.21"
+    }
+    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" : "",
+    ]
+}