diff --git a/overlay/entrypoint.sh b/overlay/entrypoint.sh index ce895c7..bc17878 100644 --- a/overlay/entrypoint.sh +++ b/overlay/entrypoint.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash ### # File: entrypoint.sh -# Project: docker-steamos +# Project: docker-steam-headless # File Created: Saturday, 8th January 2022 7:08:46 pm # Author: Josh.5 (jsunnex@gmail.com) # ----- @@ -17,8 +17,8 @@ if [ ! -z "$@" ]; then exit $? fi -# Execute all init scripts -for init_script in /scripts/*.sh ; do +# Execute all container init scripts +for init_script in /etc/cont-init.d/*.sh ; do echo echo "[ ${init_script}: executing... ]" sed -i 's/\r$//' "${init_script}" diff --git a/overlay/scripts/10-setup_user.sh b/overlay/etc/cont-init.d/10-setup_user.sh similarity index 100% rename from overlay/scripts/10-setup_user.sh rename to overlay/etc/cont-init.d/10-setup_user.sh diff --git a/overlay/scripts/20-configre_sshd.sh b/overlay/etc/cont-init.d/20-configre_sshd.sh similarity index 100% rename from overlay/scripts/20-configre_sshd.sh rename to overlay/etc/cont-init.d/20-configre_sshd.sh diff --git a/overlay/scripts/30-configure_dbus.sh b/overlay/etc/cont-init.d/30-configure_dbus.sh similarity index 100% rename from overlay/scripts/30-configure_dbus.sh rename to overlay/etc/cont-init.d/30-configure_dbus.sh diff --git a/overlay/scripts/40-setup_locale.sh b/overlay/etc/cont-init.d/40-setup_locale.sh similarity index 100% rename from overlay/scripts/40-setup_locale.sh rename to overlay/etc/cont-init.d/40-setup_locale.sh diff --git a/overlay/scripts/50-configure_audio.sh b/overlay/etc/cont-init.d/50-configure_audio.sh similarity index 100% rename from overlay/scripts/50-configure_audio.sh rename to overlay/etc/cont-init.d/50-configure_audio.sh diff --git a/overlay/scripts/80-configure_nvidia_driver.sh b/overlay/etc/cont-init.d/80-configure_nvidia_driver.sh similarity index 83% rename from overlay/scripts/80-configure_nvidia_driver.sh rename to overlay/etc/cont-init.d/80-configure_nvidia_driver.sh index 31e05ba..3621770 100644 --- a/overlay/scripts/80-configure_nvidia_driver.sh +++ b/overlay/etc/cont-init.d/80-configure_nvidia_driver.sh @@ -16,16 +16,17 @@ export nvidia_gpu_name=$(nvidia-smi --format=csv --query-gpu=name --id="${gpu_se export nvidia_host_driver_version="$(nvidia-smi 2> /dev/null | grep NVIDIA-SMI | cut -d ' ' -f3)" function download_driver { - mkdir -p ${USER_HOME}/.cache/nvidia + mkdir -p ${USER_HOME}/Downloads + chown -R ${USER} ${USER_HOME}/Downloads - if [[ ! -f "${USER_HOME}/.cache/nvidia/NVIDIA_${nvidia_host_driver_version}.run" ]]; then + if [[ ! -f "${USER_HOME}/Downloads/NVIDIA_${nvidia_host_driver_version}.run" ]]; then echo "Downloading driver v${nvidia_host_driver_version}" wget -q --show-progress --progress=bar:force:noscroll \ -O /tmp/NVIDIA.run \ http://download.nvidia.com/XFree86/Linux-x86_64/${nvidia_host_driver_version}/NVIDIA-Linux-x86_64-${nvidia_host_driver_version}.run [[ $? -gt 0 ]] && echo "Error downloading driver. Exit!" && return 1 - mv /tmp/NVIDIA.run ${USER_HOME}/.cache/nvidia/NVIDIA_${nvidia_host_driver_version}.run + mv /tmp/NVIDIA.run ${USER_HOME}/Downloads/NVIDIA_${nvidia_host_driver_version}.run fi } @@ -38,8 +39,8 @@ function install_driver { download_driver echo "Installing driver v${nvidia_host_driver_version} to match what is running on the host" - chmod +x ${USER_HOME}/.cache/nvidia/NVIDIA_${nvidia_host_driver_version}.run - ${USER_HOME}/.cache/nvidia/NVIDIA_${nvidia_host_driver_version}.run \ + chmod +x ${USER_HOME}/Downloads/NVIDIA_${nvidia_host_driver_version}.run + ${USER_HOME}/Downloads/NVIDIA_${nvidia_host_driver_version}.run \ --silent \ --accept-license \ --no-kernel-module \ @@ -51,7 +52,7 @@ function install_driver { --no-check-for-alternate-installs \ --no-libglx-indirect \ --no-install-libglvnd \ - > ${USER_HOME}/.cache/nvidia/last_install.log 2>&1 + > ${USER_HOME}/Downloads/nvidia_gpu_install.log 2>&1 } if [[ -z ${nvidia_pci_address} ]]; then diff --git a/overlay/scripts/90-configure_xorg.sh b/overlay/etc/cont-init.d/90-configure_xorg.sh similarity index 100% rename from overlay/scripts/90-configure_xorg.sh rename to overlay/etc/cont-init.d/90-configure_xorg.sh diff --git a/overlay/opt/scripts/drop_caches.sh b/overlay/opt/scripts/drop_caches.sh new file mode 100755 index 0000000..ccc18bb --- /dev/null +++ b/overlay/opt/scripts/drop_caches.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +### +# File: drop_caches.sh +# Project: docker-steam-headless +# File Created: Wednesday, 12th January 2022 5:08:46 pm +# Author: Josh.5 (jsunnex@gmail.com) +# ----- +# Last Modified: Wednesday, 12th January 2022 5:44:17 pm +# Modified By: Josh.5 (jsunnex@gmail.com) +### + +# Clear out the memory page cache +echo 1 > /proc/sys/vm/drop_caches + +# Flush any FS buffers +sync