From f563654c8fae3102e2d0b4e0130961f74704ce7f Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 7 Oct 2022 17:53: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 240ee3ca..d472cfc4 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 3e052801..369baefc 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 06ca72d3..d9351b01 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 \ icewm && \ echo "**** cleanup ****" && \ dnf autoremove -y && \ diff --git a/README.md b/README.md index db4c7fb0..857da227 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." }