fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1689 from fluxcd/alpine-3.21 

Update Alpine to 3.21 and xx to 1.6.1
This commit is contained in:
Stefan Prodan 2024-12-11 11:33:41 +02:00 committed by GitHub
parent 4d34b3f843 1cfb5d6c00
commit b5881fb4f6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@ -1,10 +1,10 @@
ARG BASE_VARIANT=alpine ARG BASE_VARIANT=alpine
ARG GO_VERSION=1.23 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 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 FROM gostable AS go-linux
@ -17,7 +17,7 @@ RUN apk add --no-cache clang lld
COPY --from=xx / / COPY --from=xx / /
# build-go-mod can still be cached at build platform architecture. # build-go-mod can still be cached at build platform architecture.
FROM build-base as build FROM build-base AS build
ARG TARGETPLATFORM ARG TARGETPLATFORM
@ -60,7 +60,7 @@ RUN export CGO_LDFLAGS="-static -fuse-ld=lld" && \
# Ensure that the binary was cross-compiled correctly to the target platform. # Ensure that the binary was cross-compiled correctly to the target platform.
RUN xx-verify --static /source-controller RUN xx-verify --static /source-controller
FROM alpine:3.19 FROM alpine:3.21
ARG TARGETPLATFORM ARG TARGETPLATFORM
RUN apk --no-cache add ca-certificates \ RUN apk --no-cache add ca-certificates \