diff --git a/Dockerfile b/Dockerfile index 70e44916..566a51df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-rdesktop:arch-dbus-9661fcf4-ls33 +FROM ghcr.io/linuxserver/baseimage-rdesktop:arch-dbus-latest # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 472aca44..ba19a2de 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-arch-dbus-9661fcf4-ls33 +FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-arch-dbus-latest # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 11d7cfe0..84419458 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-rdesktop:arm32v7-arch-dbus-9661fcf4-ls33 +FROM ghcr.io/linuxserver/baseimage-rdesktop:arm32v7-arch-dbus-latest # set version label ARG BUILD_DATE diff --git a/README.md b/README.md index ad278b43..b7a79ba8 100644 --- a/README.md +++ b/README.md @@ -298,6 +298,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **18.10.22:** - Migrate arch openbox to s6v3. * **05.03.22:** - Organize tags differently to run Ubuntu at latest LTS, make Alpine latest, add docs about GPU accel. * **05.05.21:** - Reduce default packages to their flavor specific basics. * **05.04.21:** - Add Alpine flavor. diff --git a/readme-vars.yml b/readme-vars.yml index 1abc1159..dbf31bf7 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -104,6 +104,7 @@ app_setup_block: | # changelog changelogs: + - { date: "18.10.22:", desc: "Migrate arch openbox to s6v3." } - { date: "05.03.22:", desc: "Organize tags differently to run Ubuntu at latest LTS, make Alpine latest, add docs about GPU accel." } - { date: "05.05.21:", desc: "Reduce default packages to their flavor specific basics." } - { date: "05.04.21:", desc: "Add Alpine flavor." } diff --git a/root/etc/cont-init.d/56-openboxcopy b/root/etc/cont-init.d/56-openboxcopy deleted file mode 100644 index 822bf16d..00000000 --- a/root/etc/cont-init.d/56-openboxcopy +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/with-contenv bash - -# default file copies first run -[[ ! -f /config/.config/openbox/menu.xml ]] && \ - mkdir -p /config/.config/openbox && \ - cp /defaults/menu.xml /config/.config/openbox/menu.xml && \ - chown -R abc:abc /config/.config diff --git a/root/etc/s6-overlay/s6-rc.d/init-config/dependencies.d/init-openboxcopy b/root/etc/s6-overlay/s6-rc.d/init-config/dependencies.d/init-openboxcopy new file mode 100644 index 00000000..e69de29b diff --git a/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/dependencies.d/ init-rdesktop-web-end b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/dependencies.d/ init-rdesktop-web-end new file mode 100644 index 00000000..e69de29b diff --git a/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/run b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/run new file mode 100755 index 00000000..e7504d57 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/run @@ -0,0 +1,8 @@ +#!/usr/bin/with-contenv bash + +# default file copies first run +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 00000000..3d92b15f --- /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 00000000..c5a506fb --- /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 00000000..e69de29b