From 689beff96bd2b5985e7806de942d3fab5f9376aa Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 17 Oct 2022 20:19:48 +0100 Subject: [PATCH] Migrate to s6v3 --- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- Dockerfile.armhf | 4 ++-- .../init-config/dependencies.d/init-rdesktop-end | 0 .../init-keygen/dependencies.d/init-os-end | 0 .../s6-rc.d/init-keygen/run} | 0 root/etc/s6-overlay/s6-rc.d/init-keygen/type | 1 + root/etc/s6-overlay/s6-rc.d/init-keygen/up | 1 + .../init-rdesktop-end/dependencies.d/init-video | 0 .../s6-overlay/s6-rc.d/init-rdesktop-end/type | 1 + root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/up | 1 + .../init-rdesktop/dependencies.d/init-keygen | 0 .../s6-rc.d/init-rdesktop/run} | 16 +++++++++------- root/etc/s6-overlay/s6-rc.d/init-rdesktop/type | 1 + root/etc/s6-overlay/s6-rc.d/init-rdesktop/up | 1 + .../init-video/dependencies.d/init-rdesktop | 0 .../s6-rc.d/init-video/run} | 0 root/etc/s6-overlay/s6-rc.d/init-video/type | 1 + root/etc/s6-overlay/s6-rc.d/init-video/up | 1 + .../svc-xrdp-sesman/dependencies.d/init-services | 0 .../s6-rc.d/svc-xrdp-sesman/notification-fd | 1 + .../s6-rc.d/svc-xrdp-sesman}/run | 2 +- root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/type | 1 + .../svc-xrdp/dependencies.d/init-services | 0 .../svc-xrdp/dependencies.d/svc-xrdp-sesman | 0 .../s6-rc.d/svc-xrdp}/notification-fd | 0 .../xrdp => s6-overlay/s6-rc.d/svc-xrdp}/run | 5 +---- root/etc/s6-overlay/s6-rc.d/svc-xrdp/type | 1 + .../s6-rc.d/user/contents.d/init-keygen | 0 .../s6-rc.d/user/contents.d/init-rdesktop | 0 .../s6-rc.d/user/contents.d/init-rdesktop-end | 0 .../s6-rc.d/user/contents.d/init-video | 0 .../s6-overlay/s6-rc.d/user/contents.d/svc-xrdp | 0 .../s6-rc.d/user/contents.d/svc-xrdp-sesman | 0 root/etc/services.d/xrdp/notification-fd | 1 - root/startpulse.sh | 2 +- 36 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config/dependencies.d/init-rdesktop-end create mode 100644 root/etc/s6-overlay/s6-rc.d/init-keygen/dependencies.d/init-os-end rename root/etc/{cont-init.d/13-keygen => s6-overlay/s6-rc.d/init-keygen/run} (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-keygen/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-keygen/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/dependencies.d/init-video create mode 100644 root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-rdesktop/dependencies.d/init-keygen rename root/etc/{cont-init.d/30-config => s6-overlay/s6-rc.d/init-rdesktop/run} (59%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-rdesktop/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-rdesktop/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-video/dependencies.d/init-rdesktop rename root/etc/{cont-init.d/50-gid-video => s6-overlay/s6-rc.d/init-video/run} (100%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-video/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-video/up create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/dependencies.d/init-services create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/notification-fd rename root/etc/{services.d/xrdp-sesman => s6-overlay/s6-rc.d/svc-xrdp-sesman}/run (67%) create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/type create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-xrdp/dependencies.d/init-services create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-xrdp/dependencies.d/svc-xrdp-sesman rename root/etc/{services.d/xrdp-sesman => s6-overlay/s6-rc.d/svc-xrdp}/notification-fd (100%) rename root/etc/{services.d/xrdp => s6-overlay/s6-rc.d/svc-xrdp}/run (51%) create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-xrdp/type create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-keygen create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-rdesktop create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-rdesktop-end create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-video create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-xrdp create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-xrdp-sesman delete mode 100644 root/etc/services.d/xrdp/notification-fd diff --git a/Dockerfile b/Dockerfile index b82678f..dc7451a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-arch:3d4daa98-ls73 as buildstage +FROM ghcr.io/linuxserver/baseimage-arch:latest as buildstage RUN \ echo "**** install build deps ****" && \ @@ -33,7 +33,7 @@ RUN \ FROM ghcr.io/linuxserver/docker-compose:amd64-latest as compose # runtime stage -FROM ghcr.io/linuxserver/baseimage-arch:3d4daa98-ls73 +FROM ghcr.io/linuxserver/baseimage-arch:latest # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index d6d5be5..afc86a0 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-arch:arm64v8-3d4daa98-ls73 as buildstage +FROM ghcr.io/linuxserver/baseimage-arch:arm64v8-latest as buildstage RUN \ echo "**** install build deps ****" && \ @@ -33,7 +33,7 @@ RUN \ FROM ghcr.io/linuxserver/docker-compose:amd64-latest as compose # runtime stage -FROM ghcr.io/linuxserver/baseimage-arch:arm64v8-3d4daa98-ls73 +FROM ghcr.io/linuxserver/baseimage-arch:arm64v8-latest # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index c0352f2..0193e2f 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-arch:arm32v7-3d4daa98-ls73 as buildstage +FROM ghcr.io/linuxserver/baseimage-arch:arm32v7-latest as buildstage RUN \ echo "**** install build deps ****" && \ @@ -33,7 +33,7 @@ RUN \ FROM ghcr.io/linuxserver/docker-compose:amd64-latest as compose # runtime stage -FROM ghcr.io/linuxserver/baseimage-arch:arm32v7-3d4daa98-ls73 +FROM ghcr.io/linuxserver/baseimage-arch:arm32v7-latest # set version label ARG BUILD_DATE diff --git a/root/etc/s6-overlay/s6-rc.d/init-config/dependencies.d/init-rdesktop-end b/root/etc/s6-overlay/s6-rc.d/init-config/dependencies.d/init-rdesktop-end new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-keygen/dependencies.d/init-os-end b/root/etc/s6-overlay/s6-rc.d/init-keygen/dependencies.d/init-os-end new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/13-keygen b/root/etc/s6-overlay/s6-rc.d/init-keygen/run similarity index 100% rename from root/etc/cont-init.d/13-keygen rename to root/etc/s6-overlay/s6-rc.d/init-keygen/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-keygen/type b/root/etc/s6-overlay/s6-rc.d/init-keygen/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-keygen/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-keygen/up b/root/etc/s6-overlay/s6-rc.d/init-keygen/up new file mode 100644 index 0000000..cacd3ec --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-keygen/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-keygen/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/dependencies.d/init-video b/root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/dependencies.d/init-video new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/type b/root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/up b/root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/up new file mode 100644 index 0000000..35a5520 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/up @@ -0,0 +1 @@ +# This file doesn't do anything, it's just the end of the rdesktop base init process diff --git a/root/etc/s6-overlay/s6-rc.d/init-rdesktop/dependencies.d/init-keygen b/root/etc/s6-overlay/s6-rc.d/init-rdesktop/dependencies.d/init-keygen 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 59% rename from root/etc/cont-init.d/30-config rename to root/etc/s6-overlay/s6-rc.d/init-rdesktop/run index 1a2f4d6..be4f13b --- a/root/etc/cont-init.d/30-config +++ b/root/etc/s6-overlay/s6-rc.d/init-rdesktop/run @@ -1,6 +1,6 @@ #!/usr/bin/with-contenv bash -if [ ! -e /lock.file ]; then +if [[ ! -e /lock.file ]]; then # give abc a sudo shell chsh abc -s /bin/bash sed -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=(ALL:ALL) NOPASSWD: ALL/g' \ @@ -12,12 +12,14 @@ fi touch /lock.file # default file copies first run -[[ ! -d /config/.config ]] && \ - mkdir -p /config/.config && \ - cp /defaults/bashrc /config/.bashrc && \ - cp /defaults/startwm.sh /config/startwm.sh +if [[ ! -d /config/.config ]]; then + mkdir -p /config/.config + cp /defaults/bashrc /config/.bashrc + cp /defaults/startwm.sh /config/startwm.sh +fi # permissions PERM=$(stat -c '%U' /config/.config) -[[ "${PERM}" != "abc" ]] && \ - chown -R abc:abc /config +if [[ "${PERM}" != "abc" ]]; then + chown -R abc:abc /config +fi 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/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..ec37dee 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