From c32c54e551a996783e9eb086e028539f5a968c96 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Thu, 6 Oct 2022 18:17:41 +0100
Subject: [PATCH] Migrate to s6v3

---
 Dockerfile                                                | 2 +-
 Dockerfile.aarch64                                        | 2 +-
 Dockerfile.armhf                                          | 3 ++-
 README.md                                                 | 1 +
 readme-vars.yml                                           | 1 +
 root/etc/cont-init.d/56-openboxcopy                       | 7 -------
 .../init-config-end/dependencies.d/init-openboxcopy       | 0
 .../init-openboxcopy/dependencies.d/init-rdesktop-web-end | 0
 root/etc/s6-rc.d/init-openboxcopy/run                     | 8 ++++++++
 root/etc/s6-rc.d/init-openboxcopy/type                    | 1 +
 root/etc/s6-rc.d/init-openboxcopy/up                      | 1 +
 root/etc/s6-rc.d/user/contents.d/init-openboxcopy         | 0
 12 files changed, 16 insertions(+), 10 deletions(-)
 delete mode 100644 root/etc/cont-init.d/56-openboxcopy
 create mode 100644 root/etc/s6-rc.d/init-config-end/dependencies.d/init-openboxcopy
 create mode 100644 root/etc/s6-rc.d/init-openboxcopy/dependencies.d/init-rdesktop-web-end
 create mode 100755 root/etc/s6-rc.d/init-openboxcopy/run
 create mode 100644 root/etc/s6-rc.d/init-openboxcopy/type
 create mode 100644 root/etc/s6-rc.d/init-openboxcopy/up
 create mode 100644 root/etc/s6-rc.d/user/contents.d/init-openboxcopy

diff --git a/Dockerfile b/Dockerfile
index 3aaffd60..038232a7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop:fedora-af89fa4b-ls63
+FROM ghcr.io/linuxserver/baseimage-rdesktop:fedora
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 96e618be..a9ece457 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-fedora-af89fa4b-ls63
+FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-fedora
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index b6049f57..5ca7148c 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop:arm32v7-fedora-af89fa4b-ls63
+FROM ghcr.io/linuxserver/baseimage-rdesktop:arm32v7-fedora
 
 # set version label
 ARG BUILD_DATE
@@ -9,6 +9,7 @@ LABEL maintainer="thelamer"
 RUN \
   echo "**** install packages ****" && \
   dnf install -y --forcearch armv7hl --setopt=install_weak_deps=False --best \
+    firefox \
     leafpad \
     obconf-qt \
     openbox \
diff --git a/README.md b/README.md
index 038d95b2..b99dd92d 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
 
+* **06.10.22:** - Rebase fedora-openbox to Fedora 36 & migrate 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..907de91d 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -104,6 +104,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "06.10.22:", desc: "Rebase fedora-openbox to Fedora 36 & migrate 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-rc.d/init-config-end/dependencies.d/init-openboxcopy b/root/etc/s6-rc.d/init-config-end/dependencies.d/init-openboxcopy
new file mode 100644
index 00000000..e69de29b
diff --git a/root/etc/s6-rc.d/init-openboxcopy/dependencies.d/init-rdesktop-web-end b/root/etc/s6-rc.d/init-openboxcopy/dependencies.d/init-rdesktop-web-end
new file mode 100644
index 00000000..e69de29b
diff --git a/root/etc/s6-rc.d/init-openboxcopy/run b/root/etc/s6-rc.d/init-openboxcopy/run
new file mode 100755
index 00000000..e7504d57
--- /dev/null
+++ b/root/etc/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-rc.d/init-openboxcopy/type b/root/etc/s6-rc.d/init-openboxcopy/type
new file mode 100644
index 00000000..3d92b15f
--- /dev/null
+++ b/root/etc/s6-rc.d/init-openboxcopy/type
@@ -0,0 +1 @@
+oneshot
\ No newline at end of file
diff --git a/root/etc/s6-rc.d/init-openboxcopy/up b/root/etc/s6-rc.d/init-openboxcopy/up
new file mode 100644
index 00000000..c5a506fb
--- /dev/null
+++ b/root/etc/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-rc.d/user/contents.d/init-openboxcopy b/root/etc/s6-rc.d/user/contents.d/init-openboxcopy
new file mode 100644
index 00000000..e69de29b