From 882d4fa6797423710b3f0074e8d557b5955e488e Mon Sep 17 00:00:00 2001
From: gilangjavier <gilangjavier@users.noreply.github.com>
Date: Wed, 25 Mar 2026 13:09:39 +0700
Subject: [PATCH] fix(install): ensure gnupg available for NVIDIA toolkit

Fixes #522
---
 install/install_nomad.sh | 37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/install/install_nomad.sh b/install/install_nomad.sh
index e67f4e5..b880a86 100644
--- a/install/install_nomad.sh
+++ b/install/install_nomad.sh
@@ -245,12 +245,43 @@ setup_nvidia_container_toolkit() {
   
   echo -e "${YELLOW}#${RESET} Installing NVIDIA container toolkit...\\n"
   
+  # Ensure gpg is available (needed to add NVIDIA apt repo key)
+  if ! command -v gpg &> /dev/null; then
+    echo -e "${YELLOW}#${RESET} gpg not found. Installing 'gnupg' (required for NVIDIA container toolkit repo setup)...\\n"
+    if ! sudo apt-get update 2>/dev/null; then
+      echo -e "${YELLOW}#${RESET} Warning: Failed to update package list to install gnupg. Continuing anyway...\\n"
+      return 0
+    fi
+    if ! sudo apt-get install -y gnupg 2>/dev/null; then
+      echo -e "${YELLOW}#${RESET} Warning: Failed to install gnupg. Continuing anyway...\\n"
+      return 0
+    fi
+    if ! command -v gpg &> /dev/null; then
+      echo -e "${YELLOW}#${RESET} Warning: gpg still not available after installing gnupg. Continuing anyway...\\n"
+      return 0
+    fi
+  fi
+
   # Install dependencies per https://docs.ollama.com/docker - wrapped in error handling
-  if ! curl -fsSL https://nvidia.github.io/libnvidia-container/gpgkey 2>/dev/null | sudo gpg --dearmor -o /usr/share/keyrings/nvidia-container-toolkit-keyring.gpg 2>/dev/null; then
-    echo -e "${YELLOW}#${RESET} Warning: Failed to add NVIDIA container toolkit GPG key. Continuing anyway...\\n"
+  local nvidia_gpg_tmp="/tmp/nvidia-container-toolkit.gpgkey"
+  if ! curl -fsSL https://nvidia.github.io/libnvidia-container/gpgkey -o "$nvidia_gpg_tmp" 2>/dev/null; then
+    echo -e "${YELLOW}#${RESET} Warning: Failed to download NVIDIA container toolkit GPG key. Continuing anyway...\\n"
     return 0
   fi
-  
+
+  if ! sudo mkdir -p /usr/share/keyrings 2>/dev/null; then
+    echo -e "${YELLOW}#${RESET} Warning: Failed to create /usr/share/keyrings directory. Continuing anyway...\\n"
+    sudo rm -f "$nvidia_gpg_tmp" 2>/dev/null || true
+    return 0
+  fi
+
+  if ! sudo gpg --dearmor -o /usr/share/keyrings/nvidia-container-toolkit-keyring.gpg "$nvidia_gpg_tmp" 2>/dev/null; then
+    echo -e "${YELLOW}#${RESET} Warning: Failed to add NVIDIA container toolkit GPG key. Continuing anyway...\\n"
+    sudo rm -f "$nvidia_gpg_tmp" 2>/dev/null || true
+    return 0
+  fi
+  sudo rm -f "$nvidia_gpg_tmp" 2>/dev/null || true
+
   if ! curl -fsSL https://nvidia.github.io/libnvidia-container/stable/deb/nvidia-container-toolkit.list 2>/dev/null \
       | sed 's#deb https://#deb [signed-by=/usr/share/keyrings/nvidia-container-toolkit-keyring.gpg] https://#g' \
       | sudo tee /etc/apt/sources.list.d/nvidia-container-toolkit.list > /dev/null 2>&1; then