Skip to content

Commit

Permalink
fixup dev dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
olix0r committed Nov 3, 2023
1 parent 6eb77e6 commit ebf5a35
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@

ARG RUST_IMAGE=ghcr.io/linkerd/dev:v42-rust

# Use an arbitrary ~recent edge release image to get the proxy
# identity-initializing and linkerd-await wrappers.
# Currently pinned to a build off of edge-23.11.1 + dev:v42
ARG RUNTIME_IMAGE=ghcr.io/olix0r/l2-proxy:git-04283611

# Build the proxy.
FROM --platform=$BUILDPLATFORM $RUST_IMAGE as build

Expand Down Expand Up @@ -39,9 +34,18 @@ RUN --mount=type=cache,id=cargo,target=/usr/local/cargo/registry \
mkdir -p /out && \
mv $(just --evaluate profile="$PROFILE" _target_bin) /out/linkerd2-proxy

## Install the proxy binary into the base runtime image.
FROM $RUNTIME_IMAGE as runtime
# Use an arbitrary ~recent edge release image to get the proxy
# identity-initializing and linkerd-await wrappers.
# Currently pinned to a build off of edge-23.11.1 + dev:v42
ARG LINKERD2_IMAGE=ghcr.io/olix0r/l2-proxy:git-04283611
FROM $LINKERD2_IMAGE as linkerd2

# Install the proxy binary into a base image that we can at least get a shell to
# debug on.
FROM docker.io/library/debian:bookworm-slim as runtime
WORKDIR /linkerd
COPY --from=linkerd2 /usr/lib/linkerd/linkerd-await /usr/lib/linkerd/linkerd-await
COPY --from=linkerd2 /usr/lib/linkerd/linkerd2-network-validator /usr/lib/linkerd/linkerd2-network-validator
COPY --from=linkerd2 /usr/lib/linkerd/linkerd2-proxy-identity /usr/lib/linkerd/linkerd2-proxy-identity
COPY --from=build /out/linkerd2-proxy /usr/lib/linkerd/linkerd2-proxy
ENV LINKERD2_PROXY_LOG=warn,linkerd=info,trust_dns=error
# Inherits the ENTRYPOINT from the runtime image.
ENTRYPOINT ["/usr/lib/linkerd/linkerd2-proxy-identity"]

0 comments on commit ebf5a35

Please sign in to comment.