Skip to content

Commit a0e3bf7

Browse files
committed
try local registry again...
Signed-off-by: Alex Leong <[email protected]>
1 parent f0dc78a commit a0e3bf7

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Dockerfile.proxy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
ARG BUILDPLATFORM=linux/amd64
2+
ARG RUNTIME_IMAGE=proxy-runtime:latest
3+
ARG TARGETARCH
24

35
# Precompile key slow-to-build dependencies
46
FROM --platform=$BUILDPLATFORM golang:1.25-alpine AS go-deps
@@ -58,7 +60,7 @@ ARG TARGETARCH
5860
RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH GO111MODULE=on \
5961
go build -o /out/linkerd2-proxy-init -mod=readonly -ldflags "-s -w" -v ./proxy-init
6062

61-
FROM runtime_image AS runtime
63+
FROM $RUNTIME_IMAGE-$TARGETARCH AS runtime
6264
LABEL org.opencontainers.image.source=https://github.com/linkerd/linkerd2
6365

6466
COPY --from=proxy-init /out/linkerd2-proxy-init /usr/lib/linkerd/linkerd2-proxy-init

bin/docker-build-proxy

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ rootdir=$( cd "$bindir"/.. && pwd )
2020
. "$bindir"/_os.sh
2121

2222
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)}"
2424

2525
get_extra_options() {
2626
options=
@@ -44,5 +44,4 @@ docker_build proxy "${TAG:-$(head_root_tag)}" "$dockerfile" \
4444
--build-arg LINKERD2_PROXY_REPO="${LINKERD2_PROXY_REPO:-linkerd/linkerd2-proxy}" \
4545
--build-arg LINKERD2_PROXY_VERSION="${LINKERD2_PROXY_VERSION:-$(cat .proxy-version)}" \
4646
--secret id=github,env=LINKERD2_PROXY_GITHUB_TOKEN \
47-
--build-context runtime_image="docker-image://$runtime_image-$(architecture)" \
4847
$(get_extra_options)

0 commit comments

Comments
 (0)