Skip to content

Commit 734328e

Browse files
authored
Merge pull request #6492 from thaJeztah/fix_alpine
e2e: update openssh, openssl to work around openssh bug
2 parents 9c88b31 + b611f28 commit 734328e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

e2e/testdata/Dockerfile.connhelper-ssh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ ARG ENGINE_VERSION=28
77
FROM docker:${ENGINE_VERSION}-dind
88

99
# 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 upgrade openssh-client && \
11-
apk --no-cache add shadow openssh-server && \
10+
RUN apk --no-cache add openssl openssh-client openssh-server shadow && \
11+
apk --no-cache upgrade openssl openssh-client openssh-server && \
1212
# TODO(krissetto): `groupadd` can be removed once we only test against moby >= v24
1313
# see https://github.com/docker-library/docker/pull/470
1414
groupadd -f docker && \

0 commit comments

Comments
 (0)