From 08e37473cfac0431ac4fc496599bd94e7373d2d3 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 7 Oct 2022 17:50:48 +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 5802964a..58c2647e 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 496e5e98..4dc674c9 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +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 diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 742c1d99..0b7361af 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 @@ -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 324110f6..81c8a10d 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-xfce to Fedora 36, migrate to s6v3. * **20.04.21:** - Initial release. diff --git a/readme-vars.yml b/readme-vars.yml index 28b85b87..f1117b2a 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-xfce to Fedora 36, migrate to s6v3." } - { date: "20.04.21:", desc: "Initial release." }