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

---
 Dockerfile         | 2 +-
 Dockerfile.aarch64 | 2 +-
 Dockerfile.armhf   | 3 ++-
 README.md          | 1 +
 readme-vars.yml    | 1 +
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 314c00c6..28ef4fd8 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 f9784039..33efd062 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 c293a6e0..42674c1c 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
@@ -13,6 +13,7 @@ RUN \
     greybird-dark-theme \
     greybird-xfwm4-theme \
     gtk-xfce-engine \
+    firefox \
     mousepad \
     Thunar \
     xfce4-appfinder \
diff --git a/README.md b/README.md
index 48daf297..b00793d5 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-xfce to Fedora 36 and 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..13694364 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-xfce to Fedora 36 and 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." }