Remove support for DinD

overlay/etc/cont-init.d/60-configure_gpu_driver.sh

@@ -80,7 +80,7 @@ function install_nvidia_driver {
             --no-libglx-indirect \
             --no-install-libglvnd \
             > ${USER_HOME}/Downloads/nvidia_gpu_install.log 2>&1
-	    else 
+    else 
         echo "Installing Legacy NVIDIA driver v${nvidia_host_driver_version} to match what is running on the host"
         chmod +x ${USER_HOME}/Downloads/NVIDIA_${nvidia_host_driver_version}.run
         ${USER_HOME}/Downloads/NVIDIA_${nvidia_host_driver_version}.run \

overlay/etc/cont-init.d/80-configure_dind.sh

@@ -1,24 +0,0 @@
-
-echo "**** Configure Dockerd ****"
-
-if ([ "${MODE}" != "s" ] && [ "${MODE}" != "secondary" ]); then
-    if [ ! -S /var/run/docker.sock ]; then
-        echo "Enable Dockerd daemon"
-        sed -i 's|^autostart.*=.*$|autostart=true|' /etc/supervisor.d/dind.ini
-    else
-        echo "Docker socket has been passed in from host. Using that instead"
-    fi
-    # Configure 'default' user to run docker commands without sudo
-    if ! getent group docker &> /dev/null; then
-        echo "Add user '${USER}' to docker group for sudoless execution"
-        groupadd docker
-        usermod -aG docker ${USER}
-        mkdir -p ${USER_HOME:?}/.docker
-        chown -R ${PUID}:${PGID} ${USER_HOME:?}/.docker
-        chmod -R g+rwx ${USER_HOME:?}/.docker
-    fi
-else
-    echo "Dockerd daemon not available when container is run in 'secondary' mode"
-fi
-
-echo "DONE"

overlay/etc/cont-init.d/95-configure_secondary.sh

@@ -31,10 +31,4 @@ if [ "${MODE}" == "s" ] | [ "${MODE}" == "secondary" ]; then
     sed -i 's|^autostart.*=.*$|autostart=true|' /etc/supervisor.d/udev.ini
 fi
 
-# TODO: Disabled some stuff for development... re-enable it after Arch is working
-echo " - DISABLEING dind"
-sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/dind.ini
-#echo " - DISABLEING desktop"
-#sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/desktop.ini
-
 echo "DONE"

overlay/etc/supervisor.d/dind.ini

@@ -1,14 +0,0 @@
-
-[program:dind]
-priority=20
-autostart=false
-autorestart=true
-user=root
-command=/usr/bin/start-dind.sh
-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/usr/bin/start-dind.sh

@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-###
-# File: start-dind.sh
-# Project: bin
-# File Created: Saturday, 8th October 2022 1:49:45 pm
-# Author: Josh.5 (jsunnex@gmail.com)
-# -----
-# Last Modified: Saturday, 8th October 2022 1:49:45 pm
-# Modified By: Josh.5 (jsunnex@gmail.com)
-###
-set -e
-
-
-# CATCH TERM SIGNAL:
-_term() {
-    kill -TERM "$docker_pid" 2>/dev/null
-}
-trap _term SIGTERM SIGINT
-
-
-# CONFIGURE:
-#   Refrences:
-#       - https://raw.githubusercontent.com/docker/docker/42b1175eda071c0e9121e1d64345928384a93df1/hack/dind
-#
-# apparmor sucks and Docker needs to know that it's in a container (c) @tianon
-export container=docker
-if [ -d /sys/kernel/security ] && ! mountpoint -q /sys/kernel/security; then
-	mount -t securityfs none /sys/kernel/security || {
-		echo >&2 'Could not mount /sys/kernel/security.'
-		echo >&2 'AppArmor detection and --privileged mode might break.'
-	}
-fi
-# cgroup v2: enable nesting
-if [ -f /sys/fs/cgroup/cgroup.controllers ]; then
-	# move the processes from the root group to the /init group,
-	# otherwise writing subtree_control fails with EBUSY.
-	# An error during moving non-existent process (i.e., "cat") is ignored.
-	mkdir -p /sys/fs/cgroup/init
-	xargs -rn1 < /sys/fs/cgroup/cgroup.procs > /sys/fs/cgroup/init/cgroup.procs || :
-	# enable controllers
-	sed -e 's/ / +/g' -e 's/^/+/' < /sys/fs/cgroup/cgroup.controllers \
-		> /sys/fs/cgroup/cgroup.subtree_control
-fi
-
-
-# EXECUTE PROCESS:
-/usr/local/bin/dockerd &
-docker_pid=$!
-
-
-# WAIT FOR CHILD PROCESS:
-wait "$docker_pid"