From 8d1233778ebadb461c9faf1836cb6c68a61369a7 Mon Sep 17 00:00:00 2001 From: Vid Smole Date: Tue, 21 Jul 2026 16:06:47 +0200 Subject: [PATCH 1/3] Do not run update, we already run it at the start of TUI --- subscripts/2Install/6Install_Docker.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/subscripts/2Install/6Install_Docker.sh b/subscripts/2Install/6Install_Docker.sh index 2f9e5f0..1923951 100755 --- a/subscripts/2Install/6Install_Docker.sh +++ b/subscripts/2Install/6Install_Docker.sh @@ -4,7 +4,8 @@ # Instructions for installing and configuring Nvidia Container Toolkit: https://docs.nvidia.com/jetson/orin-nano-devkit/user-guide/latest/setup_docker.html # Note that the instructions for the toolkit are wrong. The correct package to install is nvidia-container-toolkit, not nvidia-container, see https://github.com/fly4future/install_script/pull/18 for more info. -sudo apt-get update +set -e + sudo apt-get install -y ca-certificates curl # Check if we're running on an NVIDIA Jetson device. From f01239539e42b6300eb8f8c653d1bdf95b052925 Mon Sep 17 00:00:00 2001 From: Vid Smole Date: Tue, 21 Jul 2026 16:08:35 +0200 Subject: [PATCH 2/3] Add user to group only if not already present --- subscripts/2Install/6Install_Docker.sh | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/subscripts/2Install/6Install_Docker.sh b/subscripts/2Install/6Install_Docker.sh index 1923951..ee20448 100755 --- a/subscripts/2Install/6Install_Docker.sh +++ b/subscripts/2Install/6Install_Docker.sh @@ -41,13 +41,22 @@ if grep -q "NVIDIA Jetson" /proc/device-tree/model > /dev/null 2>&1; then sudo jq '. + {"default-runtime": "nvidia"}' /etc/docker/daemon.json | sudo tee /etc/docker/daemon.json.tmp sudo mv /etc/docker/daemon.json.tmp /etc/docker/daemon.json sudo systemctl restart docker + + +# Add current user to docker group if not already a member +if ! groups "$USER" | grep -qw docker; then + echo "Adding $USER to docker group..." + sudo usermod -aG docker "$USER" +else + echo "$USER is already in the docker group." fi -echo "Add user $USER to docker group" -sudo usermod -aG docker $USER +echo +echo "Installation complete." +echo -echo "" -echo "Docker installation complete. Please log out and log back in to apply the changes to your group and be able to use the docker command without sudo." -echo "" +if ! groups "$USER" | grep -qw docker; then + echo "Please log out and log back in for docker group membership to take effect." +fi exit 0 From 59c9af956b480394f49f6afbb271cc4c2bef304f Mon Sep 17 00:00:00 2001 From: Vid Smole Date: Tue, 21 Jul 2026 16:10:26 +0200 Subject: [PATCH 3/3] Cleanup installing and configuring docker --- subscripts/2Install/6Install_Docker.sh | 48 ++++++++++++++++++++------ 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/subscripts/2Install/6Install_Docker.sh b/subscripts/2Install/6Install_Docker.sh index ee20448..2b9a876 100755 --- a/subscripts/2Install/6Install_Docker.sh +++ b/subscripts/2Install/6Install_Docker.sh @@ -9,17 +9,37 @@ set -e sudo apt-get install -y ca-certificates curl # Check if we're running on an NVIDIA Jetson device. -if grep -q "NVIDIA Jetson" /proc/device-tree/model > /dev/null 2>&1; then +IS_JETSON=false +if grep -q "NVIDIA Jetson" /proc/device-tree/model >/dev/null 2>&1; then + IS_JETSON=true +fi + +# Install Jetson dependencies if needed +if [ "$IS_JETSON" = true ]; then + echo "Installing NVIDIA Container Toolkit..." sudo apt-get install -y nvidia-container-toolkit jq fi -# Add Docker's official GPG key: -sudo install -m 0755 -d /etc/apt/keyrings -sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc -sudo chmod a+r /etc/apt/keyrings/docker.asc +# Check whether Docker is already installed +if command -v docker >/dev/null 2>&1; then + echo "Docker is already installed:" + docker --version + DOCKER_ALREADY_INSTALLED=true +else + DOCKER_ALREADY_INSTALLED=false +fi + +# Install Docker only if not already present +if [ "$DOCKER_ALREADY_INSTALLED" = false ]; then + echo "Installing Docker..." + + # Add Docker's official GPG key + sudo install -m 0755 -d /etc/apt/keyrings + sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc + sudo chmod a+r /etc/apt/keyrings/docker.asc -# Add the repository to Apt sources: -sudo tee /etc/apt/sources.list.d/docker.sources </dev/null < /dev/null 2>&1; then + sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin + + sudo systemctl enable --now docker + + echo "Docker successfully installed." +fi + +if [ "$IS_JETSON" = true ]; then echo "Configuring Docker to use NVIDIA Container Toolkit as the default runtime..." sudo nvidia-ctk runtime configure --runtime=docker sudo systemctl daemon-reload @@ -42,6 +67,7 @@ if grep -q "NVIDIA Jetson" /proc/device-tree/model > /dev/null 2>&1; then sudo mv /etc/docker/daemon.json.tmp /etc/docker/daemon.json sudo systemctl restart docker +fi # Add current user to docker group if not already a member if ! groups "$USER" | grep -qw docker; then