Merge branch 'update-libnvidia-container' into 'master'

Update changelogs See merge request nvidia/container-toolkit/container-toolkit!109
Update libnvidia-container submodule
2025-06-26 18:18:24 +00:00 · 2022-02-14 11:52:36 +00:00 · 2022-02-14 12:09:03 +01:00 · 2022-02-14 10:12:45 +01:00 · 2022-02-10 08:43:20 +00:00 · 2022-02-10 09:00:14 +01:00
9 changed files with 45 additions and 8 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -94,6 +94,7 @@ unit-tests:
    - .multi-arch-build
    - .package-artifacts
  stage: package-build
+  timeout: 2h 30m
  script:
    - ./scripts/release.sh ${DIST}-${ARCH}

@@ -339,7 +340,6 @@ test-docker-ubuntu18.04:
  extends:
    - .package-build
  stage: build-all
-  timeout: 2h 30m
  rules:
    - if: $CI_COMMIT_TAG
      when: always
--- a/build/container/Dockerfile.centos
+++ b/build/container/Dockerfile.centos
@@ -42,6 +42,15 @@ RUN GOPATH=/artifacts go install -ldflags="-s -w -X 'main.Version=${VERSION}'" .

 FROM nvidia/cuda:${CUDA_VERSION}-base-${BASE_DIST}

+ARG BASE_DIST
+# See https://www.centos.org/centos-linux-eol/
+# and https://stackoverflow.com/a/70930049
+RUN [[ "${BASE_DIST}" != "centos8" ]] || \
+    ( \
+      sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Linux-* && \
+      sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-Linux-* \
+    )
+
 ENV NVIDIA_DISABLE_REQUIRE="true"
 ENV NVIDIA_VISIBLE_DEVICES=all
 ENV NVIDIA_DRIVER_CAPABILITIES=utility
--- a/docker/Dockerfile.centos
+++ b/docker/Dockerfile.centos
@@ -1,6 +1,14 @@
 ARG BASEIMAGE
 FROM ${BASEIMAGE}

+ARG BASEIMAGE
+# See https://www.centos.org/centos-linux-eol/
+# and https://stackoverflow.com/a/70930049
+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.centos.org|g' /etc/yum.repos.d/CentOS-Linux-* \
+    )
 RUN yum install -y \
        ca-certificates \
        wget \
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,3 +1,16 @@
+nvidia-container-toolkit (1.8.1-1) UNRELEASED; urgency=medium
+
+ * [libnvidia-container] Fix bug in determining cgroup root when running in nested containers
+ * [libnvidia-container] Fix permission issue when determining cgroup version
+
+ -- NVIDIA CORPORATION <cudatools@nvidia.com> Mon, 14 Feb 2022 09:53:26 +0100
+
+nvidia-container-toolkit (1.8.0-1) UNRELEASED; urgency=medium
+
+ * Promote 1.8.0~rc.2-1 to 1.8.0-1
+
+ -- NVIDIA CORPORATION <cudatools@nvidia.com> Fri, 04 Feb 2022 06:04:39 +0100
+
 nvidia-container-toolkit (1.8.0~rc.2-1) UNRELEASED; urgency=medium

  * Remove support for building amazonlinux1 packages
--- a/packaging/rpm/SPECS/nvidia-container-toolkit.spec
+++ b/packaging/rpm/SPECS/nvidia-container-toolkit.spec
@@ -64,6 +64,13 @@ rm -f %{_bindir}/nvidia-container-runtime-hook
 /usr/share/containers/oci/hooks.d/oci-nvidia-hook.json

 %changelog
+* Mon Feb 14 2022 NVIDIA CORPORATION <cudatools@nvidia.com> 1.8.1-1
+- [libnvidia-container] Fix bug in determining cgroup root when running in nested containers
+- [libnvidia-container] Fix permission issue when determining cgroup version
+
+* Fri Feb 04 2022 NVIDIA CORPORATION <cudatools@nvidia.com> 1.8.0-1
+- Promote 1.8.0-0.1.rc.2 to 1.8.0-1
+
 * Thu Jan 20 2022 NVIDIA CORPORATION <cudatools@nvidia.com> 1.8.0-0.1.rc.2
 - Remove support for building amazonlinux1 packages

--- a/third_party/libnvidia-container
+++ b/third_party/libnvidia-container
--- a/third_party/nvidia-container-runtime
+++ b/third_party/nvidia-container-runtime
--- a/third_party/nvidia-docker
+++ b/third_party/nvidia-docker
--- a/versions.mk
+++ b/versions.mk
@@ -13,12 +13,12 @@
 # limitations under the License.

 LIB_NAME := nvidia-container-toolkit
-LIB_VERSION := 1.8.0
-LIB_TAG := rc.2
+LIB_VERSION := 1.8.1
+LIB_TAG :=

 # Specify the nvidia-docker2 and nvidia-container-runtime package versions
-NVIDIA_DOCKER_VERSION := 2.9.0
-NVIDIA_CONTAINER_RUNTIME_VERSION := 3.8.0
+NVIDIA_DOCKER_VERSION := 2.9.1
+NVIDIA_CONTAINER_RUNTIME_VERSION := 3.8.1

 CUDA_VERSION := 11.6.0
 GOLANG_VERSION := 1.16.4
Author	SHA1	Message	Date
Evan Lezar	2c0a66c08c	Merge branch 'update-libnvidia-container' into 'master' Update changelogs See merge request nvidia/container-toolkit/container-toolkit!109	2022-02-14 11:52:36 +00:00
Evan Lezar	ce7076e231	Update libnvidia-container submodule Signed-off-by: Evan Lezar <elezar@nvidia.com>	2022-02-14 12:09:03 +01:00
Evan Lezar	b79c9b9bca	Update changelogs Signed-off-by: Evan Lezar <elezar@nvidia.com>	2022-02-14 10:12:45 +01:00
Evan Lezar	37a00041c4	Merge branch 'bump-1.8.1' into 'master' Bump version to 1.8.1 See merge request nvidia/container-toolkit/container-toolkit!107	2022-02-10 08:43:20 +00:00
Evan Lezar	424b591535	Update libnvidia-container submodule Signed-off-by: Evan Lezar <elezar@nvidia.com>	2022-02-10 09:00:14 +01:00
Evan Lezar	99f6d45d71	Bump version to 1.8.1 This change make the following version bumps: * nvidia-container-toolkit to 1.8.1 * nvidia-contianer-runtime to 3.8.1 * nvidia-docker to 2.9.1 Signed-off-by: Evan Lezar <elezar@nvidia.com>	2022-02-10 08:59:17 +01:00
Evan Lezar	a85caf93ff	Fix changelog entry in rpm spec Signed-off-by: Evan Lezar <elezar@nvidia.com>	2022-02-09 14:00:41 +01:00
Kevin Klues	87e715ce6b	Merge branch 'bump-version-1.8.0' into 'master' Bump version to 1.8.0 See merge request nvidia/container-toolkit/container-toolkit!105	2022-02-04 09:08:17 +00:00
Evan Lezar	96811666b4	Update component submodules Signed-off-by: Evan Lezar <elezar@nvidia.com>	2022-02-04 09:24:29 +01:00
Evan Lezar	c76767d703	Bump version to 1.8.0 Signed-off-by: Evan Lezar <elezar@nvidia.com>	2022-02-04 09:24:27 +01:00
Evan Lezar	588fdc82f7	Merge branch 'fix-centos8' into 'master' Update centos8 repos See merge request nvidia/container-toolkit/container-toolkit!104	2022-02-03 08:32:04 +00:00
Evan Lezar	5863be46ee	Use 2h30m timeout for all packaging stages Signed-off-by: Evan Lezar <elezar@nvidia.com>	2022-02-02 15:53:46 +01:00
Evan Lezar	f097af79ca	Update centos8 mirrors Signed-off-by: Evan Lezar <elezar@nvidia.com>	2022-02-02 13:43:31 +01:00
Evan Lezar	5c76493642	Update sub-modules Signed-off-by: Evan Lezar <elezar@nvidia.com>	2022-02-02 13:43:31 +01:00
Evan Lezar	ad877fb811	Bump version to 1.8.0-rc.3 Signed-off-by: Evan Lezar <elezar@nvidia.com>	2022-02-02 13:43:31 +01:00