Remove support for DinD
This commit is contained in:
@@ -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 \
|
||||
|
||||
@@ -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"
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user