Skip to content

Commit b5881fb

Browse files
authored
Merge pull request #1689 from fluxcd/alpine-3.21
Update Alpine to 3.21 and xx to 1.6.1
2 parents 4d34b3f + 1cfb5d6 commit b5881fb

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
ARG BASE_VARIANT=alpine
22
ARG GO_VERSION=1.23
3-
ARG XX_VERSION=1.4.0
3+
ARG XX_VERSION=1.6.1
44

55
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
66

7-
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT} as gostable
7+
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-${BASE_VARIANT} AS gostable
88

99
FROM gostable AS go-linux
1010

@@ -17,7 +17,7 @@ RUN apk add --no-cache clang lld
1717
COPY --from=xx / /
1818

1919
# build-go-mod can still be cached at build platform architecture.
20-
FROM build-base as build
20+
FROM build-base AS build
2121

2222
ARG TARGETPLATFORM
2323

@@ -60,7 +60,7 @@ RUN export CGO_LDFLAGS="-static -fuse-ld=lld" && \
6060
# Ensure that the binary was cross-compiled correctly to the target platform.
6161
RUN xx-verify --static /source-controller
6262

63-
FROM alpine:3.19
63+
FROM alpine:3.21
6464

6565
ARG TARGETPLATFORM
6666
RUN apk --no-cache add ca-certificates \

0 commit comments

Comments
 (0)