diff --git a/Dockerfile b/Dockerfile index 8965e14..7057de9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy-cd65f39a-ls39 as buildstage +FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy as buildstage ARG XRDP_PULSE_VERSION=v0.6 @@ -52,7 +52,7 @@ RUN \ FROM ghcr.io/linuxserver/docker-compose:amd64-latest as compose # runtime stage -FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy-cd65f39a-ls39 +FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy # set version label ARG BUILD_DATE @@ -84,6 +84,7 @@ RUN \ libxfixes3 \ libxml2 \ libxrandr2 \ + netcat \ openssh-client \ pulseaudio \ software-properties-common \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1366c31..06d6adb 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy-cd65f39a-ls39 as buildstage +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy as buildstage ARG XRDP_PULSE_VERSION=v0.6 @@ -52,7 +52,7 @@ RUN \ FROM ghcr.io/linuxserver/docker-compose:arm64v8-latest as compose # runtime stage -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy-cd65f39a-ls39 +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy # set version label ARG BUILD_DATE @@ -81,6 +81,7 @@ RUN \ libxfixes3 \ libxml2 \ libxrandr2 \ + netcat \ openssh-client \ pulseaudio \ software-properties-common \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 14bba51..555d703 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy-cd65f39a-ls39 as buildstage +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy as buildstage ARG XRDP_PULSE_VERSION=v0.6 @@ -52,7 +52,7 @@ RUN \ FROM ghcr.io/linuxserver/docker-compose:arm32v7-latest as compose # runtime stage -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy-cd65f39a-ls39 +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy # set version label ARG BUILD_DATE @@ -81,6 +81,7 @@ RUN \ libxfixes3 \ libxml2 \ libxrandr2 \ + netcat \ openssh-client \ pulseaudio \ software-properties-common \ diff --git a/root/etc/cont-init.d/12-prep_xrdp b/root/etc/cont-init.d/12-prep_xrdp deleted file mode 100755 index 92e32e1..0000000 --- a/root/etc/cont-init.d/12-prep_xrdp +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/with-contenv bash - -mkdir -p /var/run/xrdp || exit 1 -chown root:xrdp /var/run/xrdp || exit 1 -chmod 2775 /var/run/xrdp || exit 1 - -mkdir -p /var/run/xrdp/sockdir || exit 1 -chown root:xrdp /var/run/xrdp/sockdir || exit 1 -chmod 3777 /var/run/xrdp/sockdir || exit 1 diff --git a/root/etc/cont-init.d/13-keygen b/root/etc/cont-init.d/13-keygen deleted file mode 100755 index 7d1bc73..0000000 --- a/root/etc/cont-init.d/13-keygen +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/with-contenv bash - -if [ ! -f "/keylock" ]; then - cd /etc/xrdp - xrdp-keygen xrdp - rm -f /etc/xrdp/*.pem - openssl req -x509 -nodes -days 3650 -newkey rsa:2048 \ - -keyout /etc/xrdp/key.pem \ - -out /etc/xrdp/cert.pem \ - -subj "/C=US/ST=CA/L=Carlsbad/O=Linuxserver.io/OU=LSIO Server/CN=*" - touch /keylock -fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-config/dependencies.d/init-video b/root/etc/s6-overlay/s6-rc.d/init-config/dependencies.d/init-video new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-rdesktop/dependencies.d/init-os-end b/root/etc/s6-overlay/s6-rc.d/init-rdesktop/dependencies.d/init-os-end new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/30-config b/root/etc/s6-overlay/s6-rc.d/init-rdesktop/run old mode 100644 new mode 100755 similarity index 52% rename from root/etc/cont-init.d/30-config rename to root/etc/s6-overlay/s6-rc.d/init-rdesktop/run index 1a2f4d6..534bce5 --- a/root/etc/cont-init.d/30-config +++ b/root/etc/s6-overlay/s6-rc.d/init-rdesktop/run @@ -1,5 +1,24 @@ #!/usr/bin/with-contenv bash +mkdir -p /var/run/xrdp || exit 1 +chown root:xrdp /var/run/xrdp || exit 1 +chmod 2775 /var/run/xrdp || exit 1 + +mkdir -p /var/run/xrdp/sockdir || exit 1 +chown root:xrdp /var/run/xrdp/sockdir || exit 1 +chmod 3777 /var/run/xrdp/sockdir || exit 1 + +if [ ! -f "/keylock" ]; then + cd /etc/xrdp + xrdp-keygen xrdp + rm -f /etc/xrdp/*.pem + openssl req -x509 -nodes -days 3650 -newkey rsa:2048 \ + -keyout /etc/xrdp/key.pem \ + -out /etc/xrdp/cert.pem \ + -subj "/C=US/ST=CA/L=Carlsbad/O=Linuxserver.io/OU=LSIO Server/CN=*" + touch /keylock +fi + if [ ! -e /lock.file ]; then # give abc a sudo shell chsh abc -s /bin/bash diff --git a/root/etc/s6-overlay/s6-rc.d/init-rdesktop/type b/root/etc/s6-overlay/s6-rc.d/init-rdesktop/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-rdesktop/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-rdesktop/up b/root/etc/s6-overlay/s6-rc.d/init-rdesktop/up new file mode 100644 index 0000000..68d5137 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-rdesktop/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-rdesktop/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-video/dependencies.d/init-rdesktop b/root/etc/s6-overlay/s6-rc.d/init-video/dependencies.d/init-rdesktop new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/50-gid-video b/root/etc/s6-overlay/s6-rc.d/init-video/run old mode 100644 new mode 100755 similarity index 100% rename from root/etc/cont-init.d/50-gid-video rename to root/etc/s6-overlay/s6-rc.d/init-video/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-video/type b/root/etc/s6-overlay/s6-rc.d/init-video/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-video/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-video/up b/root/etc/s6-overlay/s6-rc.d/init-video/up new file mode 100644 index 0000000..01141b1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-video/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-video/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/dependencies.d/init-video b/root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/dependencies.d/init-video new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/notification-fd new file mode 100644 index 0000000..b8626c4 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/notification-fd @@ -0,0 +1 @@ +4 diff --git a/root/etc/services.d/xrdp-sesman/run b/root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/run similarity index 67% rename from root/etc/services.d/xrdp-sesman/run rename to root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/run index 44b91d0..f47a8c6 100755 --- a/root/etc/services.d/xrdp-sesman/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/run @@ -4,6 +4,6 @@ fdmove -c 2 1 # Notify service manager when xrdp is up -s6-notifyoncheck -w 500 -c "true &>/dev/null /dev/null