From ab3ebe5e49d7719d8e59f9b59c890e927b3fdc85 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Tue, 9 Nov 2021 21:21:15 +0100 Subject: [PATCH] Add jetpack-specific config.toml This chagne adds a jetpack-specific config.toml file which specifies supported-driver-capabilities to remove the unsupported ngx capability. Signed-off-by: Evan Lezar --- config/config.toml.ubuntu+jetpack | 19 +++++++++++++++++++ docker/docker.mk | 4 +++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 config/config.toml.ubuntu+jetpack diff --git a/config/config.toml.ubuntu+jetpack b/config/config.toml.ubuntu+jetpack new file mode 100644 index 00000000..55cb2a46 --- /dev/null +++ b/config/config.toml.ubuntu+jetpack @@ -0,0 +1,19 @@ +disable-require = false +supported-driver-capabilities = "compute,compat32,graphics,utility,video,display" +#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" diff --git a/docker/docker.mk b/docker/docker.mk index f9a5bd37..085e36da 100644 --- a/docker/docker.mk +++ b/docker/docker.mk @@ -85,7 +85,6 @@ docker-all: $(AMD64_TARGETS) $(X86_64_TARGETS) \ --%: docker-build-% @ -CONFIG_TOML_SUFFIX = $(OS) # private ubuntu target --ubuntu%: OS := ubuntu --ubuntu%: LIB_VERSION := $(LIB_VERSION)$(if $(LIB_TAG),~$(LIB_TAG)) @@ -115,6 +114,9 @@ CONFIG_TOML_SUFFIX = $(OS) --rhel%: VERSION = $(patsubst rhel%-$(ARCH),%,$(TARGET_PLATFORM)) --rhel%: ARTIFACTS_DIR = $(DIST_DIR)/rhel$(VERSION)/$(ARCH) +# 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)