Skip to content

Commit 4d497b2

Browse files
authored
Merge pull request #1730 from fluxcd/xx-build
Optimize multi-arch build with XX
2 parents ebf43ef + 0ef3567 commit 4d497b2

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125
if: startsWith(github.ref, 'refs/tags/v')
126126
with:
127127
version: latest
128-
args: release --release-notes=notes.md --clean --skip-validate
128+
args: release --release-notes=notes.md --clean --skip=validate
129129
env:
130130
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
131131
- name: Generate SLSA metadata

Dockerfile

+10-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
FROM golang:1.23-alpine as builder
1+
ARG GO_VERSION=1.23
2+
ARG XX_VERSION=1.4.0
3+
4+
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
5+
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine as builder
6+
7+
# copy build utilities
8+
COPY --from=xx / /
29

310
ARG TARGETPLATFORM
411
ARG REVISON
@@ -17,7 +24,8 @@ COPY cmd/ cmd/
1724
COPY pkg/ pkg/
1825

1926
# build
20-
RUN CGO_ENABLED=0 go build \
27+
ENV CGO_ENABLED=0
28+
RUN xx-go build \
2129
-ldflags "-s -w -X github.com/fluxcd/flagger/pkg/version.REVISION=${REVISON}" \
2230
-a -o flagger ./cmd/flagger
2331

0 commit comments

Comments
 (0)