File tree Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change 1
1
ARG BUILDPLATFORM=linux/amd64
2
+ ARG RUNTIME_IMAGE=proxy-runtime:latest
3
+ ARG TARGETARCH
2
4
3
5
# Precompile key slow-to-build dependencies
4
6
FROM --platform=$BUILDPLATFORM golang:1.25-alpine AS go-deps
@@ -58,7 +60,7 @@ ARG TARGETARCH
58
60
RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH GO111MODULE=on \
59
61
go build -o /out/linkerd2-proxy-init -mod=readonly -ldflags "-s -w" -v ./proxy-init
60
62
61
- FROM runtime_image AS runtime
63
+ FROM $RUNTIME_IMAGE-$TARGETARCH AS runtime
62
64
LABEL org.opencontainers.image.source=https://github.com/linkerd/linkerd2
63
65
64
66
COPY --from=proxy-init /out/linkerd2-proxy-init /usr/lib/linkerd/linkerd2-proxy-init
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ rootdir=$( cd "$bindir"/.. && pwd )
20
20
. " $bindir " /_os.sh
21
21
22
22
dockerfile=$rootdir /Dockerfile.proxy
23
- runtime_image=" cr.l5d.io/linkerd/ proxy-runtime:${TAG:- $(head_root_tag)} "
23
+ runtime_image=" proxy-runtime:${TAG:- $(head_root_tag)} "
24
24
25
25
get_extra_options () {
26
26
options=
@@ -44,5 +44,4 @@ docker_build proxy "${TAG:-$(head_root_tag)}" "$dockerfile" \
44
44
--build-arg LINKERD2_PROXY_REPO=" ${LINKERD2_PROXY_REPO:- linkerd/ linkerd2-proxy} " \
45
45
--build-arg LINKERD2_PROXY_VERSION=" ${LINKERD2_PROXY_VERSION:- $(cat .proxy-version)} " \
46
46
--secret id=github,env=LINKERD2_PROXY_GITHUB_TOKEN \
47
- --build-context runtime_image=" docker-image://$runtime_image -$( architecture) " \
48
47
$( get_extra_options)
You can’t perform that action at this time.
0 commit comments