Consolidate plasma build files

plasma/Dockerfile

@@ -12,7 +12,7 @@ ARG debug
 COPY mirrorlist /etc/pacman.d/mirrorlist
 
 # Copy app folder
-COPY app /app
+COPY entrypoint /entrypoint
 
 # Install packages
 RUN --mount=type=cache,sharing=locked,target=/var/cache/pacman \
@@ -54,4 +54,4 @@ ENV NVIDIA_VISIBLE_DEVICES=all
 ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility
 
 # Docker entrypoint
-ENTRYPOINT ["/app/entrypoint"]
+ENTRYPOINT ["/entrypoint"]

plasma/app/entrypoint

@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-# Export all variables
-set -a
-
-# Abort if an error is encountered
-set -e
-
-# SSH config
-if [ -f ~/.ssh/id_ed25519 ]
-then
-    chmod 0600 ~/.ssh/id_ed25519
-fi
-
-# Run all scripts in init folder
-for file in /app/init.d/*.sh
-do
-    /usr/bin/bash -c ${file} >>/app/logs/$(echo ${file} | sed 's|/app/init.d/||;s|\.sh$||').log
-done
-
-# Read cli parameters
-exec "${@}" &
-
-# Monitor log
-tail -f /app/logs/*.log

plasma/app/init.d/01-init.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-# Create base directories
-for dir in ssh config/tigervnc
-do
-    [ -d ~/.${dir} ] || mkdir -p ~/.${dir}
-done

plasma/app/init.d/90-tigervnc.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-# Launch Tigervnc
-/usr/bin/dbus-launch vncserver :0 &

plasma/entrypoint

@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+# Export all variables
+set -a
+
+# Abort if an error is encountered
+set -e
+
+# SSH config
+if [ -f ~/.ssh/id_ed25519 ]
+then
+    chmod 0600 ~/.ssh/id_ed25519
+fi
+
+# Create base directories
+for dir in ssh config/tigervnc
+do
+    [ -d ~/.${dir} ] || mkdir -p ~/.${dir}/
+done
+
+# Check for MYVNC_VNCPASS variable
+if [ -z ${MYVNC_VNCPASS} ]
+then
+    echo "MYVNC_VNCPASS env variable is missing"
+    exit 1
+fi
+
+# Configure tigervnc auth
+if [ ! -f ~/.config/tigervnc/passwd ]
+then
+    echo "${MYVNC_VNCPASS}" | vncpasswd -f >~/.config/tigervnc/passwd
+    chmod 0600 ~/.config/tigervnc/passwd
+fi
+
+# Remove VNCPASS env
+unset MYVNC_VNCPASS
+
+# VNC xstartup
+install /dev/stdin ~/.config/tigervnc/xstartup <<- xstartup
+
+unset SESSION_MANAGER
+unset DBUS_SESSION_BUS_ADDRESS
+exec ${STARTXBIN}
+xstartup
+
+# Turn vnc sharing on/off
+if [[ ${MYVNC_VNCSHARING} == "true" ]] || [[ ${MYVNC_VNCSHARING} == "1" ]]
+then
+    _MYVNC_VNCSHARING=alwaysshared
+else
+    _MYVNC_VNCSHARING=nevershared
+fi
+
+# VNC config
+cat >~/.config/tigervnc/config <<- vncconfig
+session=plasmax11
+dpi=192
+geometry=1920x1080
+framerate=60
+depth=32
+${_MYVNC_VNCSHARING}
+vncconfig
+
+# Disable KDE screenlock
+cat >~/.config/kscreenlockerrc <<- 'kscreenlockerrc'
+[Daemon]
+Autolock=false
+LockOnResume=false
+Timeout=0
+kscreenlockerrc
+
+# Launch Tigervnc
+/usr/bin/dbus-launch vncserver :0