diff --git a/Dockerfile b/Dockerfile index ef0db11..d9223e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arch-a95e952b-ls63 +FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arch # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 342a710..a22cdbd 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-arch-a95e952b-ls63 +FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-arch # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index c1a5d4a..62e480d 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-arch-a95e952b-ls63 +FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-arch # set version label ARG BUILD_DATE diff --git a/README.md b/README.md index 8fcb543..1a72ec8 100644 --- a/README.md +++ b/README.md @@ -260,6 +260,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **20.10.22:** - Migrate to s6v3. * **07.03.22:** - Add Exiftool and firefox for image exports. * **20.02.22:** - Add MariaDB, expand documentation. * **15.02.22:** - Rebase to Arch. diff --git a/readme-vars.yml b/readme-vars.yml index 8932aba..9ace482 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -77,6 +77,7 @@ app_setup_block: | # changelog changelogs: + - { date: "20.10.22:", desc: "Migrate to s6v3." } - { date: "07.03.22:", desc: "Add Exiftool and firefox for image exports." } - { date: "20.02.22:", desc: "Add MariaDB, expand documentation." } - { date: "15.02.22:", desc: "Rebase to Arch." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-openboxcopy b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-openboxcopy new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/dependencies.d/init-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/56-openboxcopy b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/run old mode 100644 new mode 100755 similarity index 78% rename from root/etc/cont-init.d/56-openboxcopy rename to root/etc/s6-overlay/s6-rc.d/init-openboxcopy/run index f22df65..e7504d5 --- a/root/etc/cont-init.d/56-openboxcopy +++ b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/run @@ -1,7 +1,8 @@ #!/usr/bin/with-contenv bash # default file copies first run -[[ ! -f /config/.config/openbox/menu.xml ]] && \ +if [[ ! -f /config/.config/openbox/menu.xml ]]; then mkdir -p /config/.config/openbox && \ cp /defaults/menu.xml /config/.config/openbox/menu.xml && \ chown -R abc:abc /config/.config +fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/type b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/up b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/up new file mode 100644 index 0000000..c5a506f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-openboxcopy/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-openboxcopy b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-openboxcopy new file mode 100644 index 0000000..e69de29