From 24d3f854af81e3fb709942820b2d109d2a71f52e Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 24 Mar 2022 13:24:48 +0200 Subject: [PATCH 1/4] Bump version to 1.10.0-rc.1 This change make the following version bumps: * nvidia-container-toolkit to 1.10.0-rc.1 * nvidia-contianer-runtime to 3.10.0-rc.1 * nvidia-docker to 2.10.0-rc.1 Signed-off-by: Evan Lezar --- packaging/debian/changelog | 6 ++++++ packaging/rpm/SPECS/nvidia-container-toolkit.spec | 3 +++ third_party/libnvidia-container | 2 +- versions.mk | 6 +++--- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 7922b0ff..5b0ec14d 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,9 @@ +nvidia-container-toolkit (1.10.0~rc.1-1) experimental; urgency=medium + + * Dummy entry + + -- NVIDIA CORPORATION Thu, 24 Mar 2022 13:22:24 +0200 + nvidia-container-toolkit (1.9.0-1) UNRELEASED; urgency=medium * [libnvidia-container] Add additional check for Tegra in /sys/.../family file in CLI diff --git a/packaging/rpm/SPECS/nvidia-container-toolkit.spec b/packaging/rpm/SPECS/nvidia-container-toolkit.spec index b0c85bd1..72533802 100644 --- a/packaging/rpm/SPECS/nvidia-container-toolkit.spec +++ b/packaging/rpm/SPECS/nvidia-container-toolkit.spec @@ -64,6 +64,9 @@ rm -f %{_bindir}/nvidia-container-runtime-hook /usr/share/containers/oci/hooks.d/oci-nvidia-hook.json %changelog +* Thu Mar 24 2022 NVIDIA CORPORATION 1.10.0-0.1.rc.1 +- Dummy entry + * Fri Mar 18 2022 NVIDIA CORPORATION 1.9.0-1 - [libnvidia-container] Add additional check for Tegra in /sys/.../family file in CLI - [libnvidia-container] Update jetpack-specific CLI option to only load Base CSV files by default diff --git a/third_party/libnvidia-container b/third_party/libnvidia-container index 5e135c17..b84f27a7 160000 --- a/third_party/libnvidia-container +++ b/third_party/libnvidia-container @@ -1 +1 @@ -Subproject commit 5e135c17d6dbae861ec343e9a8d3a0d2af758a4f +Subproject commit b84f27a79aceac0b48358281c8c509b18d68e082 diff --git a/versions.mk b/versions.mk index adbdf89c..bb824332 100644 --- a/versions.mk +++ b/versions.mk @@ -13,13 +13,13 @@ # limitations under the License. LIB_NAME := nvidia-container-toolkit -LIB_VERSION := 1.9.0 -LIB_TAG := +LIB_VERSION := 1.10.0 +LIB_TAG := rc.1 # Specify the nvidia-docker2 and nvidia-container-runtime package versions. # Note: The tag is automatically specified to match LIB_TAG. NVIDIA_DOCKER_VERSION := 2.10.0 -NVIDIA_CONTAINER_RUNTIME_VERSION := 3.9.0 +NVIDIA_CONTAINER_RUNTIME_VERSION := 3.10.0 # Specify the expected libnvidia-container0 version for arm64-based ubuntu builds. LIBNVIDIA_CONTAINER0_VERSION := 0.10.0+jetpack From a904076cf053a09dce9028a70aa8a11ac249c106 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 24 Mar 2022 16:05:23 +0200 Subject: [PATCH 2/4] Update libnvidia-container submodule to v1.10.0-rc.1 Signed-off-by: Evan Lezar --- third_party/libnvidia-container | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/libnvidia-container b/third_party/libnvidia-container index b84f27a7..a9aa8238 160000 --- a/third_party/libnvidia-container +++ b/third_party/libnvidia-container @@ -1 +1 @@ -Subproject commit b84f27a79aceac0b48358281c8c509b18d68e082 +Subproject commit a9aa8238398d2c1706bd0dbfca48f7690b5e0e70 From 24ce09db0e17c76dc18768be20331c501f678b98 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Tue, 29 Mar 2022 08:06:54 +0200 Subject: [PATCH 3/4] Update git submodules Signed-off-by: Evan Lezar --- third_party/nvidia-container-runtime | 2 +- third_party/nvidia-docker | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/nvidia-container-runtime b/third_party/nvidia-container-runtime index cb2278e9..c3d7d114 160000 --- a/third_party/nvidia-container-runtime +++ b/third_party/nvidia-container-runtime @@ -1 +1 @@ -Subproject commit cb2278e9d320034c05b949ba8c784f8e4e81d7c9 +Subproject commit c3d7d114d507e9b7ebfe9fc387a152be6ccaeea9 diff --git a/third_party/nvidia-docker b/third_party/nvidia-docker index 4175b0fc..7a02fe94 160000 --- a/third_party/nvidia-docker +++ b/third_party/nvidia-docker @@ -1 +1 @@ -Subproject commit 4175b0fc355348dc85415bccef80684f42b20662 +Subproject commit 7a02fe9453778ee09fa05c1af2a7372b1b4af608 From f50b4b2f917fab5bfd5e0ecd00b6b54f4cdd193c Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 28 Mar 2022 16:36:16 +0200 Subject: [PATCH 4/4] Switch from centos:8 to centos:stream8 images to build centos8 packages Due to the EOL of centos:8 we switch to centos:stream8 to build the centos8 and rhel8 packages. Signed-off-by: Evan Lezar --- docker/Dockerfile.centos | 9 --------- docker/docker.mk | 2 ++ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/docker/Dockerfile.centos b/docker/Dockerfile.centos index d7a7d21d..c5c70f3d 100644 --- a/docker/Dockerfile.centos +++ b/docker/Dockerfile.centos @@ -1,15 +1,6 @@ ARG BASEIMAGE FROM ${BASEIMAGE} -ARG BASEIMAGE -# See https://www.centos.org/centos-linux-eol/ -# and https://stackoverflow.com/a/70930049 for move to vault.centos.org -# and https://serverfault.com/questions/1093922/failing-to-run-yum-update-in-centos-8 for move to vault.epel.cloud -RUN [[ "${BASEIMAGE}" != "centos:8" ]] || \ - ( \ - sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Linux-* && \ - sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.epel.cloud|g' /etc/yum.repos.d/CentOS-Linux-* \ - ) RUN yum install -y \ ca-certificates \ wget \ diff --git a/docker/docker.mk b/docker/docker.mk index 9a29677a..f97d3d8a 100644 --- a/docker/docker.mk +++ b/docker/docker.mk @@ -98,6 +98,7 @@ docker-all: $(AMD64_TARGETS) $(X86_64_TARGETS) \ # private centos target --centos%: OS := centos --centos%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1) +--centos8%: BASEIMAGE = quay.io/centos/centos:stream8 # private amazonlinux target --amazonlinux%: OS := amazonlinux @@ -113,6 +114,7 @@ docker-all: $(AMD64_TARGETS) $(X86_64_TARGETS) \ --rhel%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1) --rhel%: VERSION = $(patsubst rhel%-$(ARCH),%,$(TARGET_PLATFORM)) --rhel%: ARTIFACTS_DIR = $(DIST_DIR)/rhel$(VERSION)/$(ARCH) +--rhel8%: BASEIMAGE = quay.io/centos/centos:stream8 # We allow the CONFIG_TOML_SUFFIX to be overridden. CONFIG_TOML_SUFFIX ?= $(OS)