Skip to content

Commit 86f2725

Browse files
authored
test: trim the fat from test Dockerfile (#394)
Signed-off-by: awphi <26072111+awphi@users.noreply.github.com>
1 parent 8ab8dee commit 86f2725

2 files changed

Lines changed: 2 additions & 14 deletions

File tree

internal/testutil/dind/Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,8 @@ RUN echo "PasswordAuthentication yes" >> /etc/ssh/sshd_config && \
66
echo "PermitEmptyPasswords yes" >> /etc/ssh/sshd_config && \
77
echo "PermitRootLogin yes" >> /etc/ssh/sshd_config && \
88
echo "KexAlgorithms curve25519-sha256,curve25519-sha256@libssh.org" >> /etc/ssh/sshd_config && \
9-
echo "DisableForwarding no" >> /etc/ssh/sshd_config && \
10-
echo "PermitOpen any" >> /etc/ssh/sshd_config && \
11-
echo "PermitListen any" >> /etc/ssh/sshd_config && \
12-
echo "" >> /etc/ssh/sshd_config && \
139
echo "Match all" >> /etc/ssh/sshd_config && \
14-
echo " AllowTcpForwarding yes" >> /etc/ssh/sshd_config && \
15-
echo " DisableForwarding no" >> /etc/ssh/sshd_config
10+
echo " AllowTcpForwarding yes" >> /etc/ssh/sshd_config
1611

1712
RUN passwd -d root
1813
RUN ssh-keygen -A

internal/testutil/passwordless-ssh/Dockerfile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,7 @@ RUN apk add --no-cache openssh-server
55
RUN echo "PasswordAuthentication yes" >> /etc/ssh/sshd_config && \
66
echo "PermitEmptyPasswords yes" >> /etc/ssh/sshd_config && \
77
echo "PermitRootLogin yes" >> /etc/ssh/sshd_config && \
8-
echo "KexAlgorithms curve25519-sha256,curve25519-sha256@libssh.org" >> /etc/ssh/sshd_config && \
9-
echo "DisableForwarding no" >> /etc/ssh/sshd_config && \
10-
echo "PermitOpen any" >> /etc/ssh/sshd_config && \
11-
echo "PermitListen any" >> /etc/ssh/sshd_config && \
12-
echo "" >> /etc/ssh/sshd_config && \
13-
echo "Match all" >> /etc/ssh/sshd_config && \
14-
echo " AllowTcpForwarding yes" >> /etc/ssh/sshd_config && \
15-
echo " DisableForwarding no" >> /etc/ssh/sshd_config
8+
echo "KexAlgorithms curve25519-sha256,curve25519-sha256@libssh.org" >> /etc/ssh/sshd_config
169

1710
RUN passwd -d root
1811
RUN ssh-keygen -A

0 commit comments

Comments
 (0)