From 48ed80ebf448c6230c510777973d67453bccc856 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 17 Dec 2021 15:16:42 +0100
Subject: [docker-ce] Fix https://github.com/NVIDIA/nvidia-docker/issues/1399

---
 core/modules/docker-ce/module.build | 5 +++++
 core/modules/docker-ce/module.conf  | 1 +
 2 files changed, 6 insertions(+)

(limited to 'core/modules/docker-ce')

diff --git a/core/modules/docker-ce/module.build b/core/modules/docker-ce/module.build
index 0921ebee..a7ba4966 100644
--- a/core/modules/docker-ce/module.build
+++ b/core/modules/docker-ce/module.build
@@ -67,4 +67,9 @@ build() {
 			}' "/etc/${item}" > "${MODULE_BUILD_DIR}/etc/${item}" \
 				|| perror "Could not patch /etc/$item"
 	done
+	# Workaround for https://github.com/NVIDIA/nvidia-docker/issues/1399
+	mkdir -p "${MODULE_BUILD_DIR}/etc/nvidia-container-runtime"
+	sed -r 's#^ldconfig\s*=.*$#ldconfig = "/sbin/ldconfig"#' "/etc/nvidia-container-runtime/config.toml" \
+		> "${MODULE_BUILD_DIR}/etc/nvidia-container-runtime/config.toml" \
+		|| perror "Could not patch nvidia-container config.toml"
 }
diff --git a/core/modules/docker-ce/module.conf b/core/modules/docker-ce/module.conf
index 1a45b0f8..9fc7e85a 100644
--- a/core/modules/docker-ce/module.conf
+++ b/core/modules/docker-ce/module.conf
@@ -4,6 +4,7 @@ REQUIRED_FILES="
 	/etc/systemd/system/docker.service
 	/etc/subuid
 	/etc/subgid
+	/etc/nvidia-container-runtime/config.toml
 "
 
 REQUIRED_BINARIES="
-- 
cgit v1.2.3-55-g7522