Merge pull request #59 from linuxserver/s6v3-fedora-openbox

2026-02-20 06:16:43 +08:00 · 2022-10-06 19:31:24 +01:00 · 2022-10-06 19:31:24 +01:00 · b8bf014889
commit b8bf014889
parent 62cdee729e c32c54e551
12 changed files with 16 additions and 10 deletions
--- a/2
+++ b/2
@ -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
--- 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
--- 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 \
    leafpad \
    obconf-qt \
    openbox \
--- 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-openbox 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.
--- a/readme-vars.yml
+++ b/readme-vars.yml
@ -104,6 +104,7 @@ app_setup_block: |

 # changelog
 changelogs:
+  - { date: "06.10.22:", desc: "Rebase fedora-openbox 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." }
--- a/root/etc/cont-init.d/56-openboxcopy
+++ b/root/etc/cont-init.d/56-openboxcopy
@ -1,7 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# default file copies first run
-[[ ! -f /config/.config/openbox/menu.xml ]] && \
-        mkdir -p /config/.config/openbox && \
-        cp /defaults/menu.xml /config/.config/openbox/menu.xml && \
-        chown -R abc:abc /config/.config
--- a/root/etc/s6-rc.d/init-config-end/dependencies.d/init-openboxcopy
+++ b/root/etc/s6-rc.d/init-config-end/dependencies.d/init-openboxcopy
--- a/root/etc/s6-rc.d/init-openboxcopy/dependencies.d/init-rdesktop-web-end
+++ b/root/etc/s6-rc.d/init-openboxcopy/dependencies.d/init-rdesktop-web-end
--- a/root/etc/s6-rc.d/init-openboxcopy/run
+++ b/root/etc/s6-rc.d/init-openboxcopy/run
@ -0,0 +1,8 @@
+#!/usr/bin/with-contenv bash
+
+# default file copies first run
+if [[ ! -f /config/.config/openbox/menu.xml ]]; then
+    mkdir -p /config/.config/openbox && \
+    cp /defaults/menu.xml /config/.config/openbox/menu.xml && \
+    chown -R abc:abc /config/.config
+fi
--- a/root/etc/s6-rc.d/init-openboxcopy/type
+++ b/root/etc/s6-rc.d/init-openboxcopy/type
@ -0,0 +1 @@
+oneshot
--- a/root/etc/s6-rc.d/init-openboxcopy/up
+++ b/root/etc/s6-rc.d/init-openboxcopy/up
@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-openboxcopy/run
--- a/root/etc/s6-rc.d/user/contents.d/init-openboxcopy
+++ b/root/etc/s6-rc.d/user/contents.d/init-openboxcopy
				`@ -0,0 +1 @@`
				`/etc/s6-overlay/s6-rc.d/init-openboxcopy/run`