From 5925b7e977c3923d951d9cab35453eebc6dee73c Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Fri, 18 Feb 2022 16:03:57 +0200
Subject: [PATCH 1/4] Bump version to 1.9.0-rc.1
Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
packaging/debian/changelog | 6 ++++++
packaging/rpm/SPECS/nvidia-container-toolkit.spec | 3 +++
versions.mk | 11 ++++++-----
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 6925e387..faadd79f 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-container-toolkit (1.9.0~rc.1-1) experimental; urgency=medium
+
+ * [libnvidia-container] Fix long-standing issue with running ldconfig on Debian systems
+
+ -- NVIDIA CORPORATION <cudatools@nvidia.com> Fri, 18 Feb 2022 16:05:11 +0200
+
nvidia-container-toolkit (1.8.1-1) UNRELEASED; urgency=medium
* [libnvidia-container] Fix bug in determining cgroup root when running in nested containers
diff --git a/packaging/rpm/SPECS/nvidia-container-toolkit.spec b/packaging/rpm/SPECS/nvidia-container-toolkit.spec
index 45a5ce27..de314272 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
+* Fri Feb 18 2022 NVIDIA CORPORATION <cudatools@nvidia.com> 1.9.0-0.1.rc.1
+- [libnvidia-container] Fix long-standing issue with running ldconfig on Debian systems
+
* 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
diff --git a/versions.mk b/versions.mk
index 39efe7ef..9219b90b 100644
--- a/versions.mk
+++ b/versions.mk
@@ -13,12 +13,13 @@
# limitations under the License.
LIB_NAME := nvidia-container-toolkit
-LIB_VERSION := 1.8.1
-LIB_TAG :=
+LIB_VERSION := 1.9.0
+LIB_TAG := rc.1
-# Specify the nvidia-docker2 and nvidia-container-runtime package versions
-NVIDIA_DOCKER_VERSION := 2.9.1
-NVIDIA_CONTAINER_RUNTIME_VERSION := 3.8.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
CUDA_VERSION := 11.6.0
GOLANG_VERSION := 1.16.4
From 596d7e8108c9e3de0480499570b655e5cef632b9 Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Fri, 18 Feb 2022 12:50:37 +0200
Subject: [PATCH 2/4] Fix centos8 builds
Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
build/container/Dockerfile.centos | 5 +++--
docker/Dockerfile.centos | 5 +++--
test/release/docker/centos8/Dockerfile | 5 +++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/build/container/Dockerfile.centos b/build/container/Dockerfile.centos
index 1b580b00..5358ea68 100644
--- a/build/container/Dockerfile.centos
+++ b/build/container/Dockerfile.centos
@@ -44,11 +44,12 @@ 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
+# 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 [[ "${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-* \
+ sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.epel.cloud|g' /etc/yum.repos.d/CentOS-Linux-* \
)
ENV NVIDIA_DISABLE_REQUIRE="true"
diff --git a/docker/Dockerfile.centos b/docker/Dockerfile.centos
index 71cdb761..d7a7d21d 100644
--- a/docker/Dockerfile.centos
+++ b/docker/Dockerfile.centos
@@ -3,11 +3,12 @@ FROM ${BASEIMAGE}
ARG BASEIMAGE
# See https://www.centos.org/centos-linux-eol/
-# and https://stackoverflow.com/a/70930049
+# 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.centos.org|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 \
diff --git a/test/release/docker/centos8/Dockerfile b/test/release/docker/centos8/Dockerfile
index 20cc44f8..185cb6e7 100644
--- a/test/release/docker/centos8/Dockerfile
+++ b/test/release/docker/centos8/Dockerfile
@@ -3,11 +3,12 @@ FROM ${BASEIMAGE}
ARG BASEIMAGE
# See https://www.centos.org/centos-linux-eol/
-# and https://stackoverflow.com/a/70930049
+# 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.centos.org|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 \
From 7b78a2a701ab92a3247847576b623402c27424c3 Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Fri, 18 Feb 2022 14:45:38 +0200
Subject: [PATCH 3/4] Update submodules
Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
third_party/libnvidia-container | 2 +-
third_party/nvidia-container-runtime | 2 +-
third_party/nvidia-docker | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/third_party/libnvidia-container b/third_party/libnvidia-container
index abd4e14d..3f55f9be 160000
--- a/third_party/libnvidia-container
+++ b/third_party/libnvidia-container
@@ -1 +1 @@
-Subproject commit abd4e14d8cb923e2a70b7dcfee55fbc16bffa353
+Subproject commit 3f55f9be893787df6dbacbe1f87842d520315ab2
diff --git a/third_party/nvidia-container-runtime b/third_party/nvidia-container-runtime
index 876bafab..cb2278e9 160000
--- a/third_party/nvidia-container-runtime
+++ b/third_party/nvidia-container-runtime
@@ -1 +1 @@
-Subproject commit 876bafab858eda94867e1c42053881bd28328288
+Subproject commit cb2278e9d320034c05b949ba8c784f8e4e81d7c9
diff --git a/third_party/nvidia-docker b/third_party/nvidia-docker
index 614bb9be..4175b0fc 160000
--- a/third_party/nvidia-docker
+++ b/third_party/nvidia-docker
@@ -1 +1 @@
-Subproject commit 614bb9be41f847000d6a15126f95964c163e1cb6
+Subproject commit 4175b0fc355348dc85415bccef80684f42b20662
From 38b49a7faa079b6185416795df037646c5439103 Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Fri, 18 Feb 2022 16:13:38 +0200
Subject: [PATCH 4/4] Remove unneeded build-all CI steps
Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
.common-ci.yml | 1 -
.gitlab-ci.yml | 42 ------------------------------------------
2 files changed, 43 deletions(-)
diff --git a/.common-ci.yml b/.common-ci.yml
index 33e61894..525df58c 100644
--- a/.common-ci.yml
+++ b/.common-ci.yml
@@ -32,7 +32,6 @@ stages:
- test
- scan
- release
- - build-all
# Define the distribution targets
.dist-amazonlinux2:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 27f93709..4dc22b62 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -328,45 +328,3 @@ test-docker-ubuntu18.04:
needs:
- image-ubuntu18.04
-# build-all jobs build packages for every OS / ARCH combination we support.
-#
-# They are run under two conditions:
-# 1) Automatically whenever a new tag is pushed to the repo (e.g. v1.1.0)
-# 2) Manually by a reviewer just before merging a MR.
-.build-all-for-arch:
- variables:
- # Setting DIST=docker invokes the docker- release targets
- DIST: docker
- extends:
- - .package-build
- stage: build-all
- rules:
- - if: $CI_COMMIT_TAG
- when: always
-
-# The full set of build-all jobs organized to
-# have builds for each ARCH run in parallel.
-build-all-amd64:
- extends:
- - .build-all-for-arch
- - .arch-amd64
-
-build-all-x86_64:
- extends:
- - .build-all-for-arch
- - .arch-x86_64
-
-build-all-ppc64le:
- extends:
- - .build-all-for-arch
- - .arch-ppc64le
-
-build-all-arm64:
- extends:
- - .build-all-for-arch
- - .arch-arm64
-
-build-all-aarch64:
- extends:
- - .build-all-for-arch
- - .arch-aarch64