From 0552f3b72083b42526f23b984acadb0b9e25cf11 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Thu, 6 Oct 2022 18:21:08 +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 59a2f064..6ce2b923 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 8ebe08ae..c1cf9c78 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 497ac948..c1d32b2d 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 \
     dmenu \
     feh \
     i3 \
diff --git a/README.md b/README.md
index 74513756..bf25f8d7 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-i3 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..4c2444eb 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-i3 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." }