summaryrefslogtreecommitdiffstats
path: root/core/modules/docker-ce
diff options
context:
space:
mode:
authorSimon Rettberg2021-12-17 15:16:42 +0100
committerSimon Rettberg2021-12-17 15:16:42 +0100
commit48ed80ebf448c6230c510777973d67453bccc856 (patch)
tree77e5a9831f3187f2c9cee4328a55858763cf7451 /core/modules/docker-ce
parent[qemu] Update log4j because of the CVE-2021-44228 security flaw (diff)
downloadmltk-48ed80ebf448c6230c510777973d67453bccc856.tar.gz
mltk-48ed80ebf448c6230c510777973d67453bccc856.tar.xz
mltk-48ed80ebf448c6230c510777973d67453bccc856.zip
[docker-ce] Fix https://github.com/NVIDIA/nvidia-docker/issues/1399
Diffstat (limited to 'core/modules/docker-ce')
-rw-r--r--core/modules/docker-ce/module.build5
-rw-r--r--core/modules/docker-ce/module.conf1
2 files changed, 6 insertions, 0 deletions
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="