From d24c0d0b8bea9be8141a0b5fb887b1408c2c0999 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Fri, 7 Oct 2022 17:52:03 +0100
Subject: [PATCH 1/2] Migrate to s6v3

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

diff --git a/Dockerfile b/Dockerfile
index cf3a031d..83a25370 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop-web:fedora-2c286ca1-ls70
+FROM ghcr.io/linuxserver/baseimage-rdesktop-web:fedora
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 275db1a7..b5ca14ef 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,5 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-fedora-2c286ca1-ls70
-
+FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-fedora
 # set version label
 ARG BUILD_DATE
 ARG VERSION
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index b18f3d5b..98da59dc 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-fedora-2c286ca1-ls70
+FROM ghcr.io/linuxserver/baseimage-rdesktop-web: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 \
     marco \
     mate-control-center \
     mate-desktop \
diff --git a/README.md b/README.md
index 214fd5dd..c0143df7 100644
--- a/README.md
+++ b/README.md
@@ -270,4 +270,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **07.10.22:** - Rebase fedora-mate to Fedora 36, migrate to s6v3.
 * **20.04.21:** - Initial release.
diff --git a/readme-vars.yml b/readme-vars.yml
index 28b85b87..89f6132d 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -78,4 +78,5 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "07.10.22:", desc: "Rebase fedora-mate to Fedora 36, migrate to s6v3." }
   - { date: "20.04.21:", desc: "Initial release." }

From 6ca9cb2578aea4785a70e4bb44c1dfdcdb70e616 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Fri, 7 Oct 2022 17:54:07 +0100
Subject: [PATCH 2/2] Fix formatting

---
 Dockerfile.aarch64 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index b5ca14ef..100e9ae2 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,5 @@
 FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-fedora
+
 # set version label
 ARG BUILD_DATE
 ARG VERSION