Merge pull request #19 from linuxserver/s6v3-fedora

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-fedora:35 as buildstage
+FROM ghcr.io/linuxserver/baseimage-fedora:36 as buildstage
 
 ARG XRDP_PULSE_VERSION=v0.6
 
@@ -57,7 +57,7 @@ RUN \
 FROM ghcr.io/linuxserver/docker-compose:amd64-latest as compose
 
 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-fedora:35
+FROM ghcr.io/linuxserver/baseimage-fedora:36
 
 # set version label
 ARG BUILD_DATE

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-fedora:arm64v8-35 as buildstage
+FROM ghcr.io/linuxserver/baseimage-fedora:arm64v8-36 as buildstage
 
 ARG XRDP_PULSE_VERSION=v0.6
 
@@ -57,7 +57,7 @@ RUN \
 FROM ghcr.io/linuxserver/docker-compose:arm64v8-latest as compose
 
 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-fedora:arm64v8-35
+FROM ghcr.io/linuxserver/baseimage-fedora:arm64v8-36
 
 # set version label
 ARG BUILD_DATE

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-fedora:arm32v7-35 as buildstage
+FROM ghcr.io/linuxserver/baseimage-fedora:arm32v7-36 as buildstage
 
 ARG XRDP_PULSE_VERSION=v0.6
 
@@ -57,7 +57,7 @@ RUN \
 FROM ghcr.io/linuxserver/docker-compose:arm32v7-latest as compose
 
 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-fedora:arm32v7-35
+FROM ghcr.io/linuxserver/baseimage-fedora:arm32v7-36
 
 # set version label
 ARG BUILD_DATE

root/defaults/bashrc

@@ -1,85 +0,0 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
-# for examples
-
-# If not running interactively, don't do anything
-case $- in
-    *i*) ;;
-      *) return;;
-esac
-
-# don't put duplicate lines or lines starting with space in the history.
-# See bash(1) for more options
-HISTCONTROL=ignoreboth
-
-# append to the history file, don't overwrite it
-shopt -s histappend
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=1000
-HISTFILESIZE=2000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
-    debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
-    xterm|xterm-color|*-256color) color_prompt=yes;;
-esac
-
-if [ "$color_prompt" = yes ]; then
-    if [[ ${EUID} == 0 ]] ; then
-        PS1='${debian_chroot:+($debian_chroot)}\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] '
-    else
-        PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\] \[\033[01;34m\]\w \$\[\033[00m\] '
-    fi
-else
-    PS1='${debian_chroot:+($debian_chroot)}\u@\h \w \$ '
-fi
-unset color_prompt force_color_prompt
-
-# If this is an xterm set the title to user@host:dir
-case "$TERM" in
-xterm*|rxvt*)
-    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h \w\a\]$PS1"
-    ;;
-*)
-    ;;
-esac
-
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-    alias ls='ls --color=auto'
-    alias grep='grep --color=auto'
-    alias fgrep='fgrep --color=auto'
-    alias egrep='egrep --color=auto'
-fi
-
-# some more ls aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
-
-if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
-fi
-if ! shopt -oq posix; then
-  if [ -f /usr/share/bash-completion/bash_completion ]; then
-    . /usr/share/bash-completion/bash_completion
-  elif [ -f /etc/bash_completion ]; then
-    . /etc/bash_completion
-  fi
-fi
-
-# start term in home
-cd ~

root/etc/cont-init.d/30-config

@@ -1,10 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# default file copies first run
-[[ ! -f /config/startwm ]] && \
-	cp /defaults/startwm.sh /config/startwm.sh
-
-# permissions
-PERM=$(stat -c '%U' /config/.config)
-[[ "${PERM}" != "abc" ]] && \
-        chown -R abc:abc /config

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

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

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

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

root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/type

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

root/etc/s6-overlay/s6-rc.d/init-rdesktop-end/up

@@ -0,0 +1 @@
+# This file doesn't do anything, it's just the end of the rdesktop base init process

root/etc/s6-overlay/s6-rc.d/init-rdesktop/run

@@ -0,0 +1,13 @@
+#!/usr/bin/with-contenv bash
+
+# default file copies first run
+if [ ! -d /config/.config ]; then
+    mkdir -p /config/.config
+    cp /defaults/startwm.sh /config/startwm.sh
+fi
+
+# permissions
+PERM=$(stat -c '%U' /config/.config)
+if [ "${PERM}" != "abc" ]; then
+    chown -R abc:abc /config
+fi

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

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

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

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

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

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

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

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

root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/notification-fd

@@ -0,0 +1 @@
+4

root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/run

@@ -4,6 +4,6 @@
 fdmove -c 2 1
 
 # Notify service manager when xrdp is up
-s6-notifyoncheck -w 500 -c "true &>/dev/null </dev/tcp/127.0.0.1/3350"
+s6-notifyoncheck -w 500 -c "nc -z 127.0.0.1 3350"
 
 /usr/sbin/xrdp-sesman --nodaemon

root/etc/s6-overlay/s6-rc.d/svc-xrdp-sesman/type

@@ -0,0 +1 @@
+longrun

root/etc/s6-overlay/s6-rc.d/svc-xrdp/run

@@ -4,10 +4,7 @@
 fdmove -c 2 1
 
 # Notify service manager when xrdp is up
-s6-notifyoncheck -w 500 -c "true &>/dev/null </dev/tcp/127.0.0.1/3389"
-
-# Wait until other services are running
-if { s6-svwait -t 10000 -U /var/run/s6/services/xrdp-sesman/ }
+s6-notifyoncheck -w 500 -c "nc -z 127.0.0.1 3389"
 
 # set env
 s6-env DISPLAY=:1

root/etc/s6-overlay/s6-rc.d/svc-xrdp/type

@@ -0,0 +1 @@
+longrun

root/etc/services.d/xrdp/notification-fd

@@ -1 +0,0 @@
-3

root/startpulse.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 while :
 do
-    if [[ ! `/usr/bin/pulseaudio --check` ]]; then
+    if [[ ! $(/usr/bin/pulseaudio --check) ]]; then
         /usr/bin/pulseaudio --start
     fi
     sleep 10