From c02ce1271a856c601d222018ba1fd896b3077ca7 Mon Sep 17 00:00:00 2001
From: Nicolas Perrin <nicolas.perrin@inria.fr>
Date: Wed, 9 Feb 2022 15:35:45 +0100
Subject: [PATCH] Revert "Merge branch 'nvidia-docker_debian11' into 'master'"
This reverts commit ba3db175d53a5e184a298f616f6d981528b54e52, reversing
changes made to ed35ace2ea3517970940e713f8d08103d1afc246.
---
bin/g5k-setup-nvidia-docker | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/bin/g5k-setup-nvidia-docker b/bin/g5k-setup-nvidia-docker
index 46250f5..5ecbc27 100755
--- a/bin/g5k-setup-nvidia-docker
+++ b/bin/g5k-setup-nvidia-docker
@@ -28,20 +28,9 @@ def main
# (probably because it exists on ubuntu)
ret &= sh('sudo ln -s /sbin/ldconfig /sbin/ldconfig.real').first
else
- distrib_codename = `lsb_release -cs`.strip
- # Workaround: use Debian 10 image if Debian 11 host (cf. Bug #13532)
- if distrib_codename == 'bullseye'
- ret &= sh('curl -s -L https://nvidia.github.io/nvidia-docker/debian10/nvidia-docker.list | sudo tee /etc/apt/sources.list.d/nvidia-docker.list').first
- puts "Warning: As Nvidia Docker Debian 11 image is not currently released, Nvidia Docker Debian 10 image is used !"
- else
- ret &= sh('. /etc/os-release; curl -s -L https://nvidia.github.io/nvidia-docker/$ID$VERSION_ID/nvidia-docker.list | sudo tee /etc/apt/sources.list.d/nvidia-docker.list').first
- end
+ ret &= sh('. /etc/os-release; curl -s -L https://nvidia.github.io/nvidia-docker/$ID$VERSION_ID/nvidia-docker.list | sudo tee /etc/apt/sources.list.d/nvidia-docker.list').first
end
ret &= sh('sudo apt-get update && sudo apt-get install -y nvidia-container-toolkit').first
- # Workaround if Debian 11 host (cf. Bug #13532)
- if distrib_codename == 'bullseye'
- ret &= sh('sudo sed -i \'s|^#ldconfig.*|ldconfig = "/sbin/ldconfig"|\' /etc/nvidia-container-runtime/config.toml').first
- end
ret &= sh('sudo systemctl restart docker').first
ret &= sh('sudo chmod o+rw /var/run/docker.sock').first if !options[:install]
ret
--
GitLab