Skip to content

Commit 71f08a8

Browse files
authored
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 <[email protected]>
1 parent 87adcda commit 71f08a8

File tree

2 files changed

+19
-9
lines changed

2 files changed

+19
-9
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 & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,7 @@ RUN --mount=type=cache,target=target \
6161
## Install the proxy binary into the base runtime image.
6262
FROM $RUNTIME_IMAGE as runtime
6363

64-
# When set, causes the proxy to remove the identity wrapper responsible for
65-
# CSR and key generation.
66-
ARG SKIP_IDENTITY_WRAPPER
67-
6864
WORKDIR /linkerd
6965
COPY --from=build /out/linkerd2-proxy /usr/lib/linkerd/linkerd2-proxy
7066
ENV LINKERD2_PROXY_LOG=warn,linkerd=info
71-
RUN \
72-
if [ -n "$SKIP_IDENTITY_WRAPPER" ] ; then \
73-
rm -f /usr/bin/linkerd2-proxy-run && \
74-
ln /usr/lib/linkerd/linkerd2-proxy /usr/bin/linkerd2-proxy-run ; \
75-
fi
7667
# Inherits the ENTRYPOINT from the runtime image.

0 commit comments

Comments
 (0)