Rebase alpine openbox to 3.16, migrate to s6v3

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop:alpine
+FROM ghcr.io/linuxserver/baseimage-rdesktop:3.16
 
 # set version label
 ARG BUILD_DATE
@@ -28,4 +28,5 @@ COPY /root /
 
 # ports and volumes
 EXPOSE 3389
+
 VOLUME /config

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-alpine
+FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-3.16
 
 # set version label
 ARG BUILD_DATE
@@ -28,4 +28,5 @@ COPY /root /
 
 # ports and volumes
 EXPOSE 3389
+
 VOLUME /config

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-rdesktop:arm32v7-alpine
+FROM ghcr.io/linuxserver/baseimage-rdesktop:arm32v7-3.16
 
 # set version label
 ARG BUILD_DATE
@@ -28,4 +28,5 @@ COPY /root /
 
 # ports and volumes
 EXPOSE 3389
+
 VOLUME /config

README.md

@@ -125,6 +125,10 @@ https://github.com/NVIDIA/nvidia-docker
 
 We automatically add the necessary environment variable that will utilise all the features available on a GPU on the host. Once nvidia-docker is installed on your host you will need to re/create the docker container with the nvidia container runtime `--runtime=nvidia` and add an environment variable `-e NVIDIA_VISIBLE_DEVICES=all` (can also be set to a specific gpu's UUID, this can be discovered by running `nvidia-smi --query-gpu=gpu_name,gpu_uuid --format=csv` ). NVIDIA automatically mounts the GPU and drivers from your host into the container.
 
+### Arm Devices
+
+Best effort is made to install tools to allow mounting in /dev/dri on Arm devices. In most cases if /dev/dri exists on the host it should just work. If running a Raspberry Pi 4 be sure to enable `dtoverlay=vc4-fkms-v3d` in your usercfg.txt.
+
 ## Usage
 
 Here are some example snippets to help you get started creating a container.
@@ -298,6 +302,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **26.10.22:** - Rebase Alpine openbox to 3.16, 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.

readme-vars.yml

@@ -76,7 +76,7 @@ app_setup_block: |
   The first thing you should do when you login to the container is to change the abc users password by issuing the `passwd` command.
 
   **Modern GUI desktop apps (including some flavors terminals) have issues with the latest Docker and syscall compatibility, you can use Docker with the `--security-opt seccomp=unconfined` setting to allow these syscalls or try [podman](https://podman.io/) as they have updated their codebase to support them**
- 
+
   If you ever lose your password you can always reset it by execing into the container as root:
   ```
   docker exec -it rdesktop passwd abc
@@ -102,8 +102,13 @@ app_setup_block: |
   
   We automatically add the necessary environment variable that will utilise all the features available on a GPU on the host. Once nvidia-docker is installed on your host you will need to re/create the docker container with the nvidia container runtime `--runtime=nvidia` and add an environment variable `-e NVIDIA_VISIBLE_DEVICES=all` (can also be set to a specific gpu's UUID, this can be discovered by running `nvidia-smi --query-gpu=gpu_name,gpu_uuid --format=csv` ). NVIDIA automatically mounts the GPU and drivers from your host into the container.
 
+  ### Arm Devices
+
+  Best effort is made to install tools to allow mounting in /dev/dri on Arm devices. In most cases if /dev/dri exists on the host it should just work. If running a Raspberry Pi 4 be sure to enable `dtoverlay=vc4-fkms-v3d` in your usercfg.txt.
+
 # changelog
 changelogs:
+  - { date: "26.10.22:", desc: "Rebase Alpine openbox to 3.16, 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." }

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

root/etc/s6-overlay/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

root/etc/s6-overlay/s6-rc.d/init-openboxcopy/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-openboxcopy/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-openboxcopy/run