Skip to content

Commit

Permalink
Merge pull request #1690 from fluxcd/backport-1689-to-release/v1.4.x
Browse files Browse the repository at this point in the history
[release/v1.4.x] Update Alpine to 3.21 and xx to 1.6.1
  • Loading branch information
stefanprodan authored Dec 11, 2024
2 parents 50035c6 + c8414eb commit 9ddfcdd
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
ARG BASE_VARIANT=alpine
ARG GO_VERSION=1.23
ARG XX_VERSION=1.4.0
ARG XX_VERSION=1.6.1

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

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

FROM gostable AS go-linux

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

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

ARG TARGETPLATFORM

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

FROM alpine:3.19
FROM alpine:3.21

ARG TARGETPLATFORM
RUN apk --no-cache add ca-certificates \
Expand Down

0 comments on commit 9ddfcdd

Please sign in to comment.