Skip to content

Commit a5a051e

Browse files
committed
e2e: remove workarounds for testing against dind < v24.0
Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent db9a9b7 commit a5a051e

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

e2e/testdata/Dockerfile.connhelper-ssh

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,10 @@ ARG ENGINE_VERSION=28
66

77
FROM docker:${ENGINE_VERSION}-dind
88

9-
# the openssh-client update is needed for security reasons when using docker:23.0-dind, currently maintained as an lts by mirantis
10-
RUN apk --no-cache add openssl openssh-client openssh-server && \
11-
apk --no-cache add shadow && \
12-
# TODO(krissetto): `groupadd` can be removed once we only test against moby >= v24
13-
# see https://github.com/docker-library/docker/pull/470
14-
groupadd -f docker && \
15-
useradd --create-home --shell /bin/sh --password $(head -c32 /dev/urandom | base64) penguin && \
16-
usermod -aG docker penguin && \
17-
ssh-keygen -A
9+
RUN apk --no-cache add openssl openssh-client openssh-server shadow \
10+
&& useradd --create-home --shell /bin/sh --password $(head -c32 /dev/urandom | base64) penguin \
11+
&& usermod -aG docker penguin \
12+
&& ssh-keygen -A
1813
# workaround: ssh session excludes /usr/local/bin from $PATH
1914
RUN ln -s /usr/local/bin/docker /usr/bin/docker
2015
COPY ./connhelper-ssh/entrypoint.sh /

0 commit comments

Comments
 (0)