From 1db1c029c3410bc86440943acecf26f4c0a86c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Hell=C3=ADn?= Date: Tue, 17 Oct 2023 12:18:59 +0200 Subject: [PATCH 1/6] Change cuda-keyring --- src/nvidia-cuda/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nvidia-cuda/install.sh b/src/nvidia-cuda/install.sh index cb66d3955..2d1963155 100644 --- a/src/nvidia-cuda/install.sh +++ b/src/nvidia-cuda/install.sh @@ -38,7 +38,7 @@ check_packages wget ca-certificates # Add NVIDIA's package repository to apt so that we can download packages # Always use the ubuntu2004 repo because the other repos (e.g., debian11) are missing packages NVIDIA_REPO_URL="https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64" -KEYRING_PACKAGE="cuda-keyring_1.0-1_all.deb" +KEYRING_PACKAGE="cuda-keyring_1.1-1_all.deb" KEYRING_PACKAGE_URL="$NVIDIA_REPO_URL/$KEYRING_PACKAGE" KEYRING_PACKAGE_PATH="$(mktemp -d)" KEYRING_PACKAGE_FILE="$KEYRING_PACKAGE_PATH/$KEYRING_PACKAGE" From 038856d74f42fdad1dde1cb6462784cbdd80e314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Hell=C3=ADn?= Date: Tue, 17 Oct 2023 12:30:15 +0200 Subject: [PATCH 2/6] Install gpg manually --- src/nvidia-cuda/install.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/nvidia-cuda/install.sh b/src/nvidia-cuda/install.sh index 2d1963155..8950c1f57 100644 --- a/src/nvidia-cuda/install.sh +++ b/src/nvidia-cuda/install.sh @@ -43,7 +43,15 @@ KEYRING_PACKAGE_URL="$NVIDIA_REPO_URL/$KEYRING_PACKAGE" KEYRING_PACKAGE_PATH="$(mktemp -d)" KEYRING_PACKAGE_FILE="$KEYRING_PACKAGE_PATH/$KEYRING_PACKAGE" wget -O "$KEYRING_PACKAGE_FILE" "$KEYRING_PACKAGE_URL" -apt-get install -yq "$KEYRING_PACKAGE_FILE" +dpkg -i "$KEYRING_PACKAGE_FILE" + +# Import the GPG key manually +NVIDIA_GPG_KEY_URL="https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/7fa2af80.pub" +wget -qO - "$NVIDIA_GPG_KEY_URL" | apt-key add - + +# Ensure that APT is configured to use the keyring +echo "deb [signed-by=/usr/share/keyrings/cuda-archive-keyring.gpg] $NVIDIA_REPO_URL /" > /etc/apt/sources.list.d/cuda.list + apt-get update -yq # Ensure that the requested version of CUDA is available From 8fb344e80cac2c947a5a1129fe34a81e72390723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Hell=C3=ADn?= Date: Tue, 17 Oct 2023 12:32:36 +0200 Subject: [PATCH 3/6] Update version --- src/nvidia-cuda/devcontainer-feature.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nvidia-cuda/devcontainer-feature.json b/src/nvidia-cuda/devcontainer-feature.json index 78ad10cd9..bb63ae1c7 100644 --- a/src/nvidia-cuda/devcontainer-feature.json +++ b/src/nvidia-cuda/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "nvidia-cuda", - "version": "1.1.0", + "version": "1.1.1", "name": "NVIDIA CUDA", "description": "Installs shared libraries for NVIDIA CUDA.", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nvidia-cuda", From 2dbb113bb3e7b889441b0126520b6e9a76305ff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Hell=C3=ADn?= Date: Tue, 17 Oct 2023 12:56:37 +0200 Subject: [PATCH 4/6] Fix warning and error --- src/nvidia-cuda/devcontainer-feature.json | 2 +- src/nvidia-cuda/install.sh | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/nvidia-cuda/devcontainer-feature.json b/src/nvidia-cuda/devcontainer-feature.json index bb63ae1c7..4a0fb0834 100644 --- a/src/nvidia-cuda/devcontainer-feature.json +++ b/src/nvidia-cuda/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "nvidia-cuda", - "version": "1.1.1", + "version": "1.1.2", "name": "NVIDIA CUDA", "description": "Installs shared libraries for NVIDIA CUDA.", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nvidia-cuda", diff --git a/src/nvidia-cuda/install.sh b/src/nvidia-cuda/install.sh index 8950c1f57..c4935eb64 100644 --- a/src/nvidia-cuda/install.sh +++ b/src/nvidia-cuda/install.sh @@ -49,10 +49,7 @@ dpkg -i "$KEYRING_PACKAGE_FILE" NVIDIA_GPG_KEY_URL="https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/7fa2af80.pub" wget -qO - "$NVIDIA_GPG_KEY_URL" | apt-key add - -# Ensure that APT is configured to use the keyring -echo "deb [signed-by=/usr/share/keyrings/cuda-archive-keyring.gpg] $NVIDIA_REPO_URL /" > /etc/apt/sources.list.d/cuda.list - -apt-get update -yq +apt-get update -yq --fix-missing # Ensure that the requested version of CUDA is available cuda_pkg="cuda-libraries-${CUDA_VERSION/./-}" From 42b1ddf1d40eb4f0a878a9137d47401409ce4e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Hell=C3=ADn?= Date: Tue, 17 Oct 2023 13:31:52 +0200 Subject: [PATCH 5/6] Remove GPG manually --- src/nvidia-cuda/install.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/nvidia-cuda/install.sh b/src/nvidia-cuda/install.sh index c4935eb64..9b7877123 100644 --- a/src/nvidia-cuda/install.sh +++ b/src/nvidia-cuda/install.sh @@ -45,10 +45,6 @@ KEYRING_PACKAGE_FILE="$KEYRING_PACKAGE_PATH/$KEYRING_PACKAGE" wget -O "$KEYRING_PACKAGE_FILE" "$KEYRING_PACKAGE_URL" dpkg -i "$KEYRING_PACKAGE_FILE" -# Import the GPG key manually -NVIDIA_GPG_KEY_URL="https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/7fa2af80.pub" -wget -qO - "$NVIDIA_GPG_KEY_URL" | apt-key add - - apt-get update -yq --fix-missing # Ensure that the requested version of CUDA is available From d0bb1d0fb32b6625a25294e25da00270baae57a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Hell=C3=ADn?= Date: Tue, 17 Oct 2023 13:33:12 +0200 Subject: [PATCH 6/6] Update version --- src/nvidia-cuda/devcontainer-feature.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nvidia-cuda/devcontainer-feature.json b/src/nvidia-cuda/devcontainer-feature.json index 4a0fb0834..ee7bfaacb 100644 --- a/src/nvidia-cuda/devcontainer-feature.json +++ b/src/nvidia-cuda/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "nvidia-cuda", - "version": "1.1.2", + "version": "1.1.3", "name": "NVIDIA CUDA", "description": "Installs shared libraries for NVIDIA CUDA.", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nvidia-cuda",