Add Docker in Docker

overlay/etc/cont-init.d/10-setup_user.sh

@@ -57,11 +57,21 @@ echo "Setting umask to ${UMASK}";
 umask ${UMASK}
 
 
+# TODO: Move this to its own 'display' init script. It does not really belong here
 # Configure the 'XDG_RUNTIME_DIR' path
 echo "Create the user XDG_RUNTIME_DIR path '${XDG_RUNTIME_DIR}'"
 mkdir -p ${XDG_RUNTIME_DIR}
+# Ensure it is owned by the 'default' user
 chown -R ${PUID}:${PGID} ${XDG_RUNTIME_DIR}
+# Ensure only the 'default' user can access this directory
+chmod 700 ${XDG_RUNTIME_DIR}
 export XDG_DATA_DIRS="${XDG_DATA_DIRS}:/var/lib/flatpak/exports/share:/home/${USER}/.local/share/flatpak/exports/share"
+# Ensure the start-desktop.sh script is executable
+chmod +x /usr/bin/start-desktop.sh
+# Set the default background for gnome based desktop
+mkdir -p /etc/alternatives
+ln -sf /usr/share/backgrounds/steam.jpg /etc/alternatives/desktop-background
+chmod a+r /etc/alternatives/desktop-background
 
 
 # Setup home directory and permissions
@@ -69,8 +79,6 @@ echo "Adding default home directory template"
 mkdir -p ${USER_HOME}
 chown -R ${PUID}:${PGID} /etc/home_directory_template
 rsync -aq --ignore-existing /etc/home_directory_template/ ${USER_HOME}/
-# TODO: Move this to its own init script. It does not really belong here
-chmod +x /usr/bin/start-desktop.sh
 
 
 # Setup services log path

overlay/etc/supervisor.d/dind.ini

@@ -0,0 +1,15 @@
+
+[program:dind]
+priority=20
+autostart=false
+autorestart=true
+user=root
+command=/usr/bin/start-dind.sh
+environment=DISPLAY="%(ENV_DISPLAY)s",DISPLAY_DPI="%(ENV_DISPLAY_DPI)s",XDG_RUNTIME_DIR="/run/user/0"
+stopsignal=INT
+stdout_logfile=/home/%(ENV_USER)s/.cache/log/dind.log
+stdout_logfile_maxbytes=10MB
+stdout_logfile_backups=7
+stderr_logfile=/home/%(ENV_USER)s/.cache/log/dind.err.log
+stderr_logfile_maxbytes=10MB
+stderr_logfile_backups=7

overlay/etc/supervisor.d/xorg.ini

@@ -5,7 +5,7 @@ autostart=false
 autorestart=true
 user=root
 command=/usr/bin/start-xorg.sh
-environment=DISPLAY="%(ENV_DISPLAY)s",DISPLAY_DPI="%(ENV_DISPLAY_DPI)s",XDG_RUNTIME_DIR="%(ENV_XDG_RUNTIME_DIR)s"
+environment=DISPLAY="%(ENV_DISPLAY)s",DISPLAY_DPI="%(ENV_DISPLAY_DPI)s",XDG_RUNTIME_DIR="/run/user/0"
 stopsignal=INT
 stdout_logfile=/home/%(ENV_USER)s/.cache/log/xorg.log
 stdout_logfile_maxbytes=10MB