Merge branch 'fix-centos8' into 'master'

Update centos8 repos

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

.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

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

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 \

packaging/debian/changelog

@@ -1,3 +1,9 @@
+nvidia-container-toolkit (1.8.0~rc.3-1) UNRELEASED; urgency=medium
+
+ * Placeholder for 1.8.0-rc.3 release
+
+ -- NVIDIA CORPORATION <cudatools@nvidia.com> Wed, 02 Feb 2022 13:42:18 +0100
+
 nvidia-container-toolkit (1.8.0~rc.2-1) UNRELEASED; urgency=medium
 
   * Remove support for building amazonlinux1 packages

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
+* Wed Feb 02 2022 NVIDIA CORPORATION <cudatools@nvidia.com> 1.8.0-0.1.rc.3
+- Placeholder for 1.8.0-rc.3 release
+
 * Thu Jan 20 2022 NVIDIA CORPORATION <cudatools@nvidia.com> 1.8.0-0.1.rc.2
 - Remove support for building amazonlinux1 packages
 

third_party/libnvidia-container

@@ -1 +1 @@
-Subproject commit d48f9b0d505fca0aff7c88cee790f9c56aa1b851
+Subproject commit d40877e0f914ac782c8b6b4f7507e4c84ca04733

third_party/nvidia-container-runtime

@@ -1 +1 @@
-Subproject commit 3588013b7d2a15783b3ca417b6f992197313ad5b
+Subproject commit 876bafab858eda94867e1c42053881bd28328288

third_party/nvidia-docker

@@ -1 +1 @@
-Subproject commit 51d3c9e22b2b891773ab9525eaf7b3ce1c014ab1
+Subproject commit 614bb9be41f847000d6a15126f95964c163e1cb6

versions.mk

@@ -14,7 +14,7 @@
 
 LIB_NAME := nvidia-container-toolkit
 LIB_VERSION := 1.8.0
-LIB_TAG := rc.2
+LIB_TAG := rc.3
 
 # Specify the nvidia-docker2 and nvidia-container-runtime package versions
 NVIDIA_DOCKER_VERSION := 2.9.0