From 1a86b20f7c825667dfe31e3019e27575b2edb6e1 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 13 Mar 2023 16:45:09 +0200 Subject: [PATCH] Remove config.toml from installation Since the default configuration is now platform specific, there is no need to install specific versions as part of the package installation. Signed-off-by: Evan Lezar --- config/config.toml.debian | 32 ------------------- config/config.toml.opensuse-leap | 32 ------------------- config/config.toml.rpm-yum | 32 ------------------- config/config.toml.ubuntu | 32 ------------------- docker/Dockerfile.debian | 9 ------ docker/Dockerfile.opensuse-leap | 4 --- docker/Dockerfile.rpm-yum | 4 --- docker/Dockerfile.ubuntu | 4 --- docker/docker.mk | 7 ---- .../nvidia-container-toolkit-base.install | 1 - .../rpm/SPECS/nvidia-container-toolkit.spec | 19 ++++------- 11 files changed, 7 insertions(+), 169 deletions(-) delete mode 100644 config/config.toml.debian delete mode 100644 config/config.toml.opensuse-leap delete mode 100644 config/config.toml.rpm-yum delete mode 100644 config/config.toml.ubuntu diff --git a/config/config.toml.debian b/config/config.toml.debian deleted file mode 100644 index 225ec450..00000000 --- a/config/config.toml.debian +++ /dev/null @@ -1,32 +0,0 @@ -disable-require = false -#swarm-resource = "DOCKER_RESOURCE_GPU" -#accept-nvidia-visible-devices-envvar-when-unprivileged = true -#accept-nvidia-visible-devices-as-volume-mounts = false - -[nvidia-container-cli] -#root = "/run/nvidia/driver" -#path = "/usr/bin/nvidia-container-cli" -environment = [] -#debug = "/var/log/nvidia-container-toolkit.log" -#ldcache = "/etc/ld.so.cache" -load-kmods = true -#no-cgroups = false -#user = "root:video" -ldconfig = "@/sbin/ldconfig" - -[nvidia-container-runtime] -#debug = "/var/log/nvidia-container-runtime.log" -log-level = "info" - -# Specify the runtimes to consider. This list is processed in order and the PATH -# searched for matching executables unless the entry is an absolute path. -runtimes = [ - "docker-runc", - "runc", -] - -mode = "auto" - - [nvidia-container-runtime.modes.csv] - - mount-spec-path = "/etc/nvidia-container-runtime/host-files-for-container.d" diff --git a/config/config.toml.opensuse-leap b/config/config.toml.opensuse-leap deleted file mode 100644 index e99585d3..00000000 --- a/config/config.toml.opensuse-leap +++ /dev/null @@ -1,32 +0,0 @@ -disable-require = false -#swarm-resource = "DOCKER_RESOURCE_GPU" -#accept-nvidia-visible-devices-envvar-when-unprivileged = true -#accept-nvidia-visible-devices-as-volume-mounts = false - -[nvidia-container-cli] -#root = "/run/nvidia/driver" -#path = "/usr/bin/nvidia-container-cli" -environment = [] -#debug = "/var/log/nvidia-container-toolkit.log" -#ldcache = "/etc/ld.so.cache" -load-kmods = true -#no-cgroups = false -user = "root:video" -ldconfig = "@/sbin/ldconfig" - -[nvidia-container-runtime] -#debug = "/var/log/nvidia-container-runtime.log" -log-level = "info" - -# Specify the runtimes to consider. This list is processed in order and the PATH -# searched for matching executables unless the entry is an absolute path. -runtimes = [ - "docker-runc", - "runc", -] - -mode = "auto" - - [nvidia-container-runtime.modes.csv] - - mount-spec-path = "/etc/nvidia-container-runtime/host-files-for-container.d" diff --git a/config/config.toml.rpm-yum b/config/config.toml.rpm-yum deleted file mode 100644 index 225ec450..00000000 --- a/config/config.toml.rpm-yum +++ /dev/null @@ -1,32 +0,0 @@ -disable-require = false -#swarm-resource = "DOCKER_RESOURCE_GPU" -#accept-nvidia-visible-devices-envvar-when-unprivileged = true -#accept-nvidia-visible-devices-as-volume-mounts = false - -[nvidia-container-cli] -#root = "/run/nvidia/driver" -#path = "/usr/bin/nvidia-container-cli" -environment = [] -#debug = "/var/log/nvidia-container-toolkit.log" -#ldcache = "/etc/ld.so.cache" -load-kmods = true -#no-cgroups = false -#user = "root:video" -ldconfig = "@/sbin/ldconfig" - -[nvidia-container-runtime] -#debug = "/var/log/nvidia-container-runtime.log" -log-level = "info" - -# Specify the runtimes to consider. This list is processed in order and the PATH -# searched for matching executables unless the entry is an absolute path. -runtimes = [ - "docker-runc", - "runc", -] - -mode = "auto" - - [nvidia-container-runtime.modes.csv] - - mount-spec-path = "/etc/nvidia-container-runtime/host-files-for-container.d" diff --git a/config/config.toml.ubuntu b/config/config.toml.ubuntu deleted file mode 100644 index e9515fd2..00000000 --- a/config/config.toml.ubuntu +++ /dev/null @@ -1,32 +0,0 @@ -disable-require = false -#swarm-resource = "DOCKER_RESOURCE_GPU" -#accept-nvidia-visible-devices-envvar-when-unprivileged = true -#accept-nvidia-visible-devices-as-volume-mounts = false - -[nvidia-container-cli] -#root = "/run/nvidia/driver" -#path = "/usr/bin/nvidia-container-cli" -environment = [] -#debug = "/var/log/nvidia-container-toolkit.log" -#ldcache = "/etc/ld.so.cache" -load-kmods = true -#no-cgroups = false -#user = "root:video" -ldconfig = "@/sbin/ldconfig.real" - -[nvidia-container-runtime] -#debug = "/var/log/nvidia-container-runtime.log" -log-level = "info" - -# Specify the runtimes to consider. This list is processed in order and the PATH -# searched for matching executables unless the entry is an absolute path. -runtimes = [ - "docker-runc", - "runc", -] - -mode = "auto" - - [nvidia-container-runtime.modes.csv] - - mount-spec-path = "/etc/nvidia-container-runtime/host-files-for-container.d" diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian index 602e3266..df576af7 100644 --- a/docker/Dockerfile.debian +++ b/docker/Dockerfile.debian @@ -53,15 +53,6 @@ ARG GIT_COMMIT ENV GIT_COMMIT ${GIT_COMMIT} RUN make PREFIX=${DIST_DIR} cmds -ARG CONFIG_TOML_SUFFIX -ENV CONFIG_TOML_SUFFIX ${CONFIG_TOML_SUFFIX} -COPY config/config.toml.${CONFIG_TOML_SUFFIX} $DIST_DIR/config.toml - -# Debian Jessie still had ldconfig.real -RUN if [ "$(lsb_release -cs)" = "jessie" ]; then \ - sed -i 's;"@/sbin/ldconfig";"@/sbin/ldconfig.real";' $DIST_DIR/config.toml; \ - fi - WORKDIR $DIST_DIR COPY packaging/debian ./debian diff --git a/docker/Dockerfile.opensuse-leap b/docker/Dockerfile.opensuse-leap index 09402a89..93e70a92 100644 --- a/docker/Dockerfile.opensuse-leap +++ b/docker/Dockerfile.opensuse-leap @@ -50,10 +50,6 @@ COPY oci-nvidia-hook $DIST_DIR/oci-nvidia-hook # Hook for libpod/CRI-O: https://github.com/containers/libpod/blob/v0.8.5/pkg/hooks/docs/oci-hooks.5.md COPY oci-nvidia-hook.json $DIST_DIR/oci-nvidia-hook.json -ARG CONFIG_TOML_SUFFIX -ENV CONFIG_TOML_SUFFIX ${CONFIG_TOML_SUFFIX} -COPY config/config.toml.${CONFIG_TOML_SUFFIX} $DIST_DIR/config.toml - WORKDIR $DIST_DIR/.. COPY packaging/rpm . diff --git a/docker/Dockerfile.rpm-yum b/docker/Dockerfile.rpm-yum index 6e5d8456..91f2d75c 100644 --- a/docker/Dockerfile.rpm-yum +++ b/docker/Dockerfile.rpm-yum @@ -62,10 +62,6 @@ ARG GIT_COMMIT ENV GIT_COMMIT ${GIT_COMMIT} RUN make PREFIX=${DIST_DIR} cmds -ARG CONFIG_TOML_SUFFIX -ENV CONFIG_TOML_SUFFIX ${CONFIG_TOML_SUFFIX} -COPY config/config.toml.${CONFIG_TOML_SUFFIX} $DIST_DIR/config.toml - # Hook for Project Atomic's fork of Docker: https://github.com/projectatomic/docker/tree/docker-1.13.1-rhel#add-dockerhooks-exec-custom-hooks-for-prestartpoststop-containerspatch COPY oci-nvidia-hook $DIST_DIR/oci-nvidia-hook diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index cf340b11..674d74a4 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -51,10 +51,6 @@ ARG GIT_COMMIT ENV GIT_COMMIT ${GIT_COMMIT} RUN make PREFIX=${DIST_DIR} cmds -ARG CONFIG_TOML_SUFFIX -ENV CONFIG_TOML_SUFFIX ${CONFIG_TOML_SUFFIX} -COPY config/config.toml.${CONFIG_TOML_SUFFIX} $DIST_DIR/config.toml - WORKDIR $DIST_DIR COPY packaging/debian ./debian diff --git a/docker/docker.mk b/docker/docker.mk index d8a2a898..3f51c873 100644 --- a/docker/docker.mk +++ b/docker/docker.mk @@ -99,13 +99,11 @@ LIBNVIDIA_CONTAINER_TOOLS_VERSION := $(LIBNVIDIA_CONTAINER_VERSION)$(if $(LIBNVI # private centos target --centos%: OS := centos --centos%: DOCKERFILE = $(CURDIR)/docker/Dockerfile.rpm-yum ---centos%: CONFIG_TOML_SUFFIX := rpm-yum --centos8%: BASEIMAGE = quay.io/centos/centos:stream8 # private amazonlinux target --amazonlinux%: OS := amazonlinux --amazonlinux%: DOCKERFILE = $(CURDIR)/docker/Dockerfile.rpm-yum ---amazonlinux%: CONFIG_TOML_SUFFIX := rpm-yum # private opensuse-leap target --opensuse-leap%: OS = opensuse-leap @@ -116,13 +114,9 @@ LIBNVIDIA_CONTAINER_TOOLS_VERSION := $(LIBNVIDIA_CONTAINER_VERSION)$(if $(LIBNVI --rhel%: VERSION = $(patsubst rhel%-$(ARCH),%,$(TARGET_PLATFORM)) --rhel%: ARTIFACTS_DIR = $(DIST_DIR)/rhel$(VERSION)/$(ARCH) --rhel%: DOCKERFILE = $(CURDIR)/docker/Dockerfile.rpm-yum ---rhel%: CONFIG_TOML_SUFFIX := rpm-yum --rhel8%: BASEIMAGE = quay.io/centos/centos:stream8 -# We allow the CONFIG_TOML_SUFFIX to be overridden. -CONFIG_TOML_SUFFIX ?= $(OS) - docker-build-%: @echo "Building for $(TARGET_PLATFORM)" docker pull --platform=linux/$(ARCH) $(BASEIMAGE) @@ -136,7 +130,6 @@ docker-build-%: --build-arg PKG_VERS="$(PACKAGE_VERSION)" \ --build-arg PKG_REV="$(PACKAGE_REVISION)" \ --build-arg LIBNVIDIA_CONTAINER_TOOLS_VERSION="$(LIBNVIDIA_CONTAINER_TOOLS_VERSION)" \ - --build-arg CONFIG_TOML_SUFFIX="$(CONFIG_TOML_SUFFIX)" \ --build-arg GIT_COMMIT="$(GIT_COMMIT)" \ --tag $(BUILDIMAGE) \ --file $(DOCKERFILE) . diff --git a/packaging/debian/nvidia-container-toolkit-base.install b/packaging/debian/nvidia-container-toolkit-base.install index 3b183ed2..af03bd06 100644 --- a/packaging/debian/nvidia-container-toolkit-base.install +++ b/packaging/debian/nvidia-container-toolkit-base.install @@ -1,3 +1,2 @@ -config.toml /etc/nvidia-container-runtime nvidia-container-runtime /usr/bin nvidia-ctk /usr/bin diff --git a/packaging/rpm/SPECS/nvidia-container-toolkit.spec b/packaging/rpm/SPECS/nvidia-container-toolkit.spec index ed44bc37..98130aa5 100644 --- a/packaging/rpm/SPECS/nvidia-container-toolkit.spec +++ b/packaging/rpm/SPECS/nvidia-container-toolkit.spec @@ -12,13 +12,12 @@ License: Apache-2.0 Source0: nvidia-container-runtime-hook Source1: nvidia-ctk -Source2: config.toml -Source3: oci-nvidia-hook -Source4: oci-nvidia-hook.json -Source5: LICENSE -Source6: nvidia-container-runtime -Source7: nvidia-container-runtime.cdi -Source8: nvidia-container-runtime.legacy +Source2: oci-nvidia-hook +Source3: oci-nvidia-hook.json +Source4: LICENSE +Source5: nvidia-container-runtime +Source6: nvidia-container-runtime.cdi +Source7: nvidia-container-runtime.legacy Obsoletes: nvidia-container-runtime <= 3.5.0-1, nvidia-container-runtime-hook <= 1.4.0-2 Provides: nvidia-container-runtime @@ -37,7 +36,7 @@ Requires: libseccomp Provides tools and utilities to enable GPU support in containers. %prep -cp %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} . +cp %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} . %install mkdir -p %{buildroot}%{_bindir} @@ -47,9 +46,6 @@ install -m 755 -t %{buildroot}%{_bindir} nvidia-container-runtime.cdi install -m 755 -t %{buildroot}%{_bindir} nvidia-container-runtime.legacy install -m 755 -t %{buildroot}%{_bindir} nvidia-ctk -mkdir -p %{buildroot}/etc/nvidia-container-runtime -install -m 644 -t %{buildroot}/etc/nvidia-container-runtime config.toml - mkdir -p %{buildroot}/usr/libexec/oci/hooks.d install -m 755 -t %{buildroot}/usr/libexec/oci/hooks.d oci-nvidia-hook @@ -100,7 +96,6 @@ Provides tools such as the NVIDIA Container Runtime and NVIDIA Container Toolkit %files base %license LICENSE -%config /etc/nvidia-container-runtime/config.toml %{_bindir}/nvidia-container-runtime %{_bindir}/nvidia-ctk