Merge pull request #77 from FeLvi-zzz/refactor-dockerfile

refactor Dockerfile and image-builder action

Author: FeLvi-zzz

.github/workflows/image-builder.yml

@@ -55,6 +55,23 @@ jobs:
           platforms: ${{ env.PLATFORMS }}
           endpoint: builders
 
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+
+      - name: build binaries
+        run: |
+          set -eux
+
+          targets=()
+
+          IFS=',' read -ra platforms <<< "${{ env.PLATFORMS }}"
+          for platform in "${platforms[@]}"; do
+            targets+=("build-${platform%%/*}-${platform##*/}")
+          done
+
+          make build_all BUILD_TARGETS="${targets[@]}"
+
       - name: Build OCI image
         uses: docker/build-push-action@v6
         with:

Dockerfile

@@ -1,26 +1,19 @@
-FROM golang:1.24.2 AS builder
-
-ARG TARGETOS=linux
-ARG TARGETARCH=amd64
-ARG REVISION=unknown
+FROM gcr.io/distroless/static:nonroot
 
-WORKDIR /app
-COPY go.mod .
-COPY go.sum .
-RUN go mod download
+# TARGETOS and TARGETARCH are automatically set by buildkit if `--platform` is passed
+# https://github.com/moby/buildkit/blob/master/frontend/dockerfile/docs/reference.md#automatic-platform-args-in-the-global-scope
+ARG TARGETOS
+ARG TARGETARCH
 
-COPY cmd/ cmd/
-COPY internal/ internal/
-COPY *.go .
+ARG REVISION=unknown
 
-RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -a -ldflags="-X github.com/FeLvi-zzz/tentez.Revision=${REVISION}" -o tentez ./cmd/tentez/main.go
+WORKDIR /
 
-FROM gcr.io/distroless/static:nonroot
+# NOTE: require the pre-built binaries in dist/
+COPY dist/tentez-${TARGETOS}-${TARGETARCH} /tentez
 
 LABEL org.opencontainers.image.title="FeLvi-zzz/tentez"
 
-WORKDIR /
-COPY --from=builder /app/tentez /tentez
 USER 65532:65532
 
 ENTRYPOINT ["/tentez"]