Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/v1.4.x] Update Alpine to 3.21 and xx to 1.6.1 #1690

Merged
merged 1 commit into from
Dec 11, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Update Alpine to 3.21 and xx to 1.6.1
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
(cherry picked from commit 1cfb5d6)
stefanprodan authored and github-actions[bot] committed Dec 11, 2024
commit c8414eb92c382616ea8a274007e422eb4583ad64
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

@@ -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

@@ -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 \