Merge branch 'fix-centos8' into 'master'

Fix centos8 builds

See merge request nvidia/container-toolkit/container-toolkit!111

.common-ci.yml

@@ -32,7 +32,6 @@ stages:
   - test
   - scan
   - release
-  - build-all
 
 # Define the distribution targets
 .dist-amazonlinux2:

.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

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"

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 \

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

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

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 \

third_party/libnvidia-container

@@ -1 +1 @@
-Subproject commit abd4e14d8cb923e2a70b7dcfee55fbc16bffa353
+Subproject commit 3f55f9be893787df6dbacbe1f87842d520315ab2

third_party/nvidia-container-runtime

@@ -1 +1 @@
-Subproject commit 876bafab858eda94867e1c42053881bd28328288
+Subproject commit cb2278e9d320034c05b949ba8c784f8e4e81d7c9

third_party/nvidia-docker

@@ -1 +1 @@
-Subproject commit 614bb9be41f847000d6a15126f95964c163e1cb6
+Subproject commit 4175b0fc355348dc85415bccef80684f42b20662

versions.mk

@@ -13,12 +13,13 @@
 # limitations under the License.
 
 LIB_NAME := nvidia-container-toolkit
-LIB_VERSION := 1.8.1
+LIB_VERSION := 1.9.0
-LIB_TAG :=
+LIB_TAG := rc.1
 
-# Specify the nvidia-docker2 and nvidia-container-runtime package versions
+# Specify the nvidia-docker2 and nvidia-container-runtime package versions.
-NVIDIA_DOCKER_VERSION := 2.9.1
+# Note: The tag is automatically specified to match LIB_TAG.
-NVIDIA_CONTAINER_RUNTIME_VERSION := 3.8.1
+NVIDIA_DOCKER_VERSION := 2.10.0
+NVIDIA_CONTAINER_RUNTIME_VERSION := 3.9.0
 
 CUDA_VERSION := 11.6.0
 GOLANG_VERSION := 1.16.4