Skip to content

Commit e592d27

Browse files
Update docker files accrodingly
Signed-off-by: Alan Moore <alan.moore@canonical.com>
1 parent 5199980 commit e592d27

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

Dockerfiles/test_suite-ubuntu2204

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ RUN true \
2626
RUN true \
2727
&& ssh-keygen -A \
2828
&& mkdir -p /root/.ssh \
29+
&& mkdir /run/sshd && chmod 0755 /run/sshd \
2930
&& printf "%s\n" "$CLIENT_PUBLIC_KEY" >> "$AUTH_KEYS" \
3031
&& chmod og-rw /root/.ssh "$AUTH_KEYS" \
3132
&& sed -i '/session\s\+required\s\+pam_loginuid.so/d' /etc/pam.d/sshd \
3233
&& echo CPE_NAME="cpe:/o:canonical:ubuntu_linux:22.04" >> /etc/os-release \
3334
&& true
34-
35-
RUN mkdir /run/sshd
36-
CMD ["/usr/sbin/sshd", "-D"]

Dockerfiles/test_suite-ubuntu2404

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@ RUN true \
1919
RUN true \
2020
&& ssh-keygen -A \
2121
&& mkdir -p /root/.ssh \
22+
&& mkdir /run/sshd && chmod 0755 /run/sshd \
2223
&& printf "%s\n" "$CLIENT_PUBLIC_KEY" >> "$AUTH_KEYS" \
2324
&& chmod og-rw /root/.ssh "$AUTH_KEYS" \
2425
&& sed -i '/session\s\+required\s\+pam_loginuid.so/d' /etc/pam.d/sshd \
25-
&& echo CPE_NAME="cpe:/o:canonical:ubuntu_linux:24.04" >> /etc/os-release
26-
27-
RUN mkdir /run/sshd
28-
CMD ["/usr/sbin/sshd", "-D"]
26+
&& echo CPE_NAME="cpe:/o:canonical:ubuntu_linux:24.04" >> /etc/os-release \
27+
&& true

0 commit comments

Comments
 (0)