From 0b0f5818b13d9788cf08b5a9bf4458f5b82b31ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Molinero=20Fern=C3=A1ndez?= Date: Sun, 1 Mar 2020 17:38:15 +0100 Subject: [PATCH] Changed order of actions --- Dockerfile.m4 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile.m4 b/Dockerfile.m4 index 2ae5af9..e0ad6e8 100644 --- a/Dockerfile.m4 +++ b/Dockerfile.m4 @@ -457,13 +457,8 @@ RUN ln -sf /dev/stdout /var/log/xdummy.log RUN ln -sf /dev/stdout /var/log/xrdp.log RUN ln -sf /dev/stdout /var/log/xrdp-sesman.log -# Copy config -COPY --chown=root:root ./config/ssh/sshd_config /etc/ssh/sshd_config -COPY --chown=root:root ./config/xrdp/xrdp.ini /etc/xrdp/xrdp.ini -COPY --chown=root:root ./config/xrdp/sesman.ini /etc/xrdp/sesman.ini - -# Copy services -COPY --chown=root:root scripts/service/ /etc/sv/ +# Copy and enable services +COPY --chown=root:root ./scripts/service/ /etc/sv/ RUN ln -sv /etc/sv/sshd /etc/service/ RUN ln -sv /etc/sv/dbus-daemon /etc/service/ RUN ln -sv /etc/sv/xrdp /etc/service/ @@ -472,6 +467,11 @@ RUN ln -sv /etc/sv/xrdp-sesman /etc/service/ # Copy scripts COPY --chown=root:root ./scripts/bin/ /usr/local/bin/ +# Copy config +COPY --chown=root:root ./config/ssh/sshd_config /etc/ssh/sshd_config +COPY --chown=root:root ./config/xrdp/xrdp.ini /etc/xrdp/xrdp.ini +COPY --chown=root:root ./config/xrdp/sesman.ini /etc/xrdp/sesman.ini + # Expose SSH port EXPOSE 3322/tcp # Expose RDP port