crichardson/docker-xubuntu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed order of actions

Browse Source
This commit is contained in:
Héctor Molinero Fernández
2020-03-01 17:38:15 +01:00
parent 00432431cd
commit 0b0f5818b1
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Dockerfile.m4
View File

@@ -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.log
RUN ln -sf /dev/stdout /var/log/xrdp-sesman.log RUN ln -sf /dev/stdout /var/log/xrdp-sesman.log
# Copy config # Copy and enable services
COPY --chown=root:root ./config/ssh/sshd_config /etc/ssh/sshd_config COPY --chown=root:root ./scripts/service/ /etc/sv/
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/
RUN ln -sv /etc/sv/sshd /etc/service/ RUN ln -sv /etc/sv/sshd /etc/service/
RUN ln -sv /etc/sv/dbus-daemon /etc/service/ RUN ln -sv /etc/sv/dbus-daemon /etc/service/
RUN ln -sv /etc/sv/xrdp /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 scripts
COPY --chown=root:root ./scripts/bin/ /usr/local/bin/ 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 SSH port
EXPOSE 3322/tcp EXPOSE 3322/tcp
# Expose RDP port # Expose RDP port