Merge pull request #27 from linuxserver/s6v3-master

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

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

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

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.

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." }

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

root/etc/s6-overlay/s6-rc.d/init-openboxcopy/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-openboxcopy/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-openboxcopy/run