Skip to content

Commit 345a547

Browse files
committed
Fix dockerfile (#1500)
PR #1479 changed the docker base image to not include a shell, which broke the dockerfile's logic for skipping the identity wrapper. It's no longer possible to run the proxy without identity, so this functionality isn't needed in any case. This change fixes the Dockerfile and adds a CI workflow to test docker builds on Dockerfile changes. Signed-off-by: Oliver Gould <ver@buoyant.io> (cherry picked from commit 71f08a8) Signed-off-by: Oliver Gould <ver@buoyant.io>
1 parent 20eab7d commit 345a547

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

.github/workflows/docker.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: docker
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- Dockerfile
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
build:
13+
runs-on: ubuntu-latest
14+
timeout-minutes: 20
15+
env:
16+
DOCKER_BUILDKIT: "1"
17+
steps:
18+
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
19+
- run: docker build . --build-arg PROXY_UNOPTIMIZED=1

Dockerfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,7 @@ RUN --mount=type=cache,target=target \
5454
## Install the proxy binary into the base runtime image.
5555
FROM $RUNTIME_IMAGE as runtime
5656

57-
# When set, causes the proxy to remove the identity wrapper responsible for
58-
# CSR and key generation.
59-
ARG SKIP_IDENTITY_WRAPPER
60-
6157
WORKDIR /linkerd
6258
COPY --from=build /out/linkerd2-proxy /usr/lib/linkerd/linkerd2-proxy
6359
ENV LINKERD2_PROXY_LOG=warn,linkerd=info
64-
RUN if [ -n "$SKIP_IDENTITY_WRAPPER" ] ; then \
65-
rm -f /usr/bin/linkerd2-proxy-run && \
66-
ln /usr/lib/linkerd/linkerd2-proxy /usr/bin/linkerd2-proxy-run ; \
67-
fi
6860
# Inherits the ENTRYPOINT from the runtime image.

0 commit comments

Comments
 (0)