18325: no debian11 packages yet for libnvidia-container-tools, use

       workaround to install experimental rc1 with debian11 support,
       when on debian11.

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/tools/compute-images/scripts/base.sh b/tools/compute-images/scripts/base.sh
index f180f81c49c75455cfcdd5aa6dda093ab218e8d9..973a4931047abee45f841e96ec42557d3cc5624e 100644 (file)
--- a/tools/compute-images/scripts/base.sh
+++ b/tools/compute-images/scripts/base.sh
@@ -166,8 +166,18 @@ if [ "$NVIDIA_GPU_SUPPORT" == "1" ]; then
   # Install libnvidia-container, the tooling for Docker/Singularity
   curl -s -L https://nvidia.github.io/libnvidia-container/gpgkey | \
     $sudo apt-key add -
-  curl -s -L https://nvidia.github.io/libnvidia-container/$DIST/libnvidia-container.list | \
-    $sudo tee /etc/apt/sources.list.d/libnvidia-container.list
+  if [ "$DIST" == "debian11" ]; then
+    # As of 2021-12-16 libnvidia-container and friends are only available for
+    # Debian 10, not yet Debian 11. Install experimental rc1 package as per this
+    # workaround:
+    # https://github.com/NVIDIA/nvidia-docker/issues/1549#issuecomment-989670662
+    curl -s -L https://nvidia.github.io/libnvidia-container/debian10/libnvidia-container.list | \
+      $sudo tee /etc/apt/sources.list.d/libnvidia-container.list
+    $sudo sed -i -e '/experimental/ s/^#//g' /etc/apt/sources.list.d/libnvidia-container.list
+  else
+    curl -s -L https://nvidia.github.io/libnvidia-container/$DIST/libnvidia-container.list | \
+      $sudo tee /etc/apt/sources.list.d/libnvidia-container.list
+  fi
   $sudo apt-get update
   $sudo apt-get -y install libnvidia-container1 libnvidia-container-tools nvidia-container-toolkit
 fi