From ad877fb811f662ec4346b8e0a4dea1911c371248 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 2 Feb 2022 13:43:19 +0100 Subject: [PATCH 1/4] Bump version to 1.8.0-rc.3 Signed-off-by: Evan Lezar --- packaging/debian/changelog | 6 ++++++ packaging/rpm/SPECS/nvidia-container-toolkit.spec | 3 +++ versions.mk | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packaging/debian/changelog b/packaging/debian/changelog index eb0699f3..bd125e92 100644 --- a/packaging/debian/changelog +++ b/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 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 diff --git a/packaging/rpm/SPECS/nvidia-container-toolkit.spec b/packaging/rpm/SPECS/nvidia-container-toolkit.spec index 27b00c52..3f2477b6 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 +* Wed Feb 02 2022 NVIDIA CORPORATION 1.8.0-0.1.rc.3 +- Placeholder for 1.8.0-rc.3 release + * Thu Jan 20 2022 NVIDIA CORPORATION 1.8.0-0.1.rc.2 - Remove support for building amazonlinux1 packages diff --git a/versions.mk b/versions.mk index 8a9e5086..db7b504b 100644 --- a/versions.mk +++ b/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 From 5c76493642f9a85916196460ed71845ce4f06df9 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Tue, 1 Feb 2022 19:06:06 +0100 Subject: [PATCH 2/4] Update sub-modules Signed-off-by: Evan Lezar --- 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 d48f9b0d..d40877e0 160000 --- a/third_party/libnvidia-container +++ b/third_party/libnvidia-container @@ -1 +1 @@ -Subproject commit d48f9b0d505fca0aff7c88cee790f9c56aa1b851 +Subproject commit d40877e0f914ac782c8b6b4f7507e4c84ca04733 diff --git a/third_party/nvidia-container-runtime b/third_party/nvidia-container-runtime index 3588013b..876bafab 160000 --- a/third_party/nvidia-container-runtime +++ b/third_party/nvidia-container-runtime @@ -1 +1 @@ -Subproject commit 3588013b7d2a15783b3ca417b6f992197313ad5b +Subproject commit 876bafab858eda94867e1c42053881bd28328288 diff --git a/third_party/nvidia-docker b/third_party/nvidia-docker index 51d3c9e2..614bb9be 160000 --- a/third_party/nvidia-docker +++ b/third_party/nvidia-docker @@ -1 +1 @@ -Subproject commit 51d3c9e22b2b891773ab9525eaf7b3ce1c014ab1 +Subproject commit 614bb9be41f847000d6a15126f95964c163e1cb6 From f097af79ca0445c72c6d70fdf8bdd524c41121e1 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Tue, 1 Feb 2022 13:54:24 +0100 Subject: [PATCH 3/4] Update centos8 mirrors Signed-off-by: Evan Lezar --- build/container/Dockerfile.centos | 9 +++++++++ docker/Dockerfile.centos | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/build/container/Dockerfile.centos b/build/container/Dockerfile.centos index c6a5b46b..1b580b00 100644 --- 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 diff --git a/docker/Dockerfile.centos b/docker/Dockerfile.centos index c5c70f3d..71cdb761 100644 --- 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 \ From 5863be46ee31a14a1dfa1dd35e3080c6d2deabf9 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 2 Feb 2022 15:53:46 +0100 Subject: [PATCH 4/4] Use 2h30m timeout for all packaging stages Signed-off-by: Evan Lezar --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index da446359..27f93709 100644 --- 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