Merge pull request #37 from linuxserver/s6v3-fedora

Author: thespad

Dockerfile

@@ -1,5 +1,5 @@
 # guacamole builder
-FROM ghcr.io/linuxserver/baseimage-fedora:35 as guacbuilder
+FROM ghcr.io/linuxserver/baseimage-fedora:36 as guacbuilder
 
 ARG GUACD_VERSION=1.1.0
 
@@ -61,7 +61,7 @@ RUN \
   make DESTDIR=/buildout install
 
 # nodejs builder
-FROM ghcr.io/linuxserver/baseimage-fedora:35 as nodebuilder
+FROM ghcr.io/linuxserver/baseimage-fedora:36 as nodebuilder
 ARG GCLIENT_RELEASE
 
 RUN \
@@ -92,7 +92,7 @@ RUN \
   npm install
 
 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-rdesktop:fedora-af89fa4b-ls63
+FROM ghcr.io/linuxserver/baseimage-rdesktop:fedora
 
 # set version label
 ARG BUILD_DATE

Dockerfile.aarch64

@@ -1,5 +1,5 @@
 # guacamole builder
-FROM ghcr.io/linuxserver/baseimage-fedora:arm64v8-35 as guacbuilder
+FROM ghcr.io/linuxserver/baseimage-fedora:arm64v8-36 as guacbuilder
 
 ARG GUACD_VERSION=1.1.0
 
@@ -61,7 +61,7 @@ RUN \
   make DESTDIR=/buildout install
 
 # nodejs builder
-FROM ghcr.io/linuxserver/baseimage-fedora:arm64v8-35 as nodebuilder
+FROM ghcr.io/linuxserver/baseimage-fedora:arm64v8-36 as nodebuilder
 ARG GCLIENT_RELEASE
 
 RUN \
@@ -95,7 +95,7 @@ RUN \
   npm install
 
 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-fedora-af89fa4b-ls63
+FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-fedora
 
 # set version label
 ARG BUILD_DATE

Dockerfile.armhf

@@ -1,5 +1,5 @@
 # guacamole builder
-FROM ghcr.io/linuxserver/baseimage-fedora:arm32v7-35 as guacbuilder
+FROM ghcr.io/linuxserver/baseimage-fedora:arm32v7-36 as guacbuilder
 
 ARG GUACD_VERSION=1.1.0
 
@@ -61,7 +61,7 @@ RUN \
   make DESTDIR=/buildout install
 
 # nodejs builder
-FROM ghcr.io/linuxserver/baseimage-fedora:arm32v7-35 as nodebuilder
+FROM ghcr.io/linuxserver/baseimage-fedora:arm32v7-36 as nodebuilder
 ARG GCLIENT_RELEASE
 
 RUN \
@@ -95,7 +95,7 @@ RUN \
   npm install
 
 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-rdesktop:arm32v7-fedora-af89fa4b-ls63
+FROM ghcr.io/linuxserver/baseimage-rdesktop:arm32v7-fedora
 
 # set version label
 ARG BUILD_DATE

root/etc/cont-init.d/55-autostart-config

@@ -0,0 +1,8 @@
+#!/usr/bin/with-contenv bash
+
+# default file copies first run
+if [ ! -d /config/.config/openbox/autostart ]; then
+    mkdir -p /config/.config/openbox
+    cp /defaults/autostart /config/.config/openbox/autostart
+    chown -R abc:abc /config/.config/openbox
+fi

root/etc/s6-overlay/s6-rc.d/init-autostart-config/dependencies.d/init-rdesktop-end

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

root/etc/s6-overlay/s6-rc.d/init-autostart-config/run

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