From 770eb72ee442b2a19cafe3a017295cbfa65b2859 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 13 May 2024 13:51:56 +0200 Subject: [PATCH 1/3] [no-relnote] Update submodule to release-1.15 Signed-off-by: Evan Lezar --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 55d6dd60..35459397 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "third_party/libnvidia-container"] path = third_party/libnvidia-container url = https://github.com/NVIDIA/libnvidia-container.git - branch = main + branch = release-1.15 From 4cb817ce927ce0fa7e8c7a49720a808af31a0676 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 1 Jul 2024 16:21:20 +0200 Subject: [PATCH 2/3] [no-relnote] Use centos:7 vault repos for builds Signed-off-by: Evan Lezar --- docker/Dockerfile.rpm-yum | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile.rpm-yum b/docker/Dockerfile.rpm-yum index 0a04e5f1..1a429f58 100644 --- a/docker/Dockerfile.rpm-yum +++ b/docker/Dockerfile.rpm-yum @@ -20,11 +20,9 @@ FROM ${BASEIMAGE} # centos:stream8 is EOL. # We switch to the vault repositories for this base image. ARG BASEIMAGE -RUN if [ "${BASEIMAGE}" = "quay.io/centos/centos:stream8" ]; then \ - sed -i -e "s|mirrorlist=|#mirrorlist=|g" \ - -e "s|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g" \ - /etc/yum.repos.d/CentOS-Stream-*; \ - fi +RUN sed -i -e "s|mirrorlist=|#mirrorlist=|g" \ + -e "s|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g" \ + /etc/yum.repos.d/CentOS-* RUN yum install -y \ ca-certificates \ From b787b46480e4b8f367279436a719a755311581b4 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 1 Jul 2024 16:43:48 +0200 Subject: [PATCH 3/3] Bump libnvidia-container to 24b3f92 Signed-off-by: Evan Lezar --- third_party/libnvidia-container | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/libnvidia-container b/third_party/libnvidia-container index e729d79b..24b3f92f 160000 --- a/third_party/libnvidia-container +++ b/third_party/libnvidia-container @@ -1 +1 @@ -Subproject commit e729d79b29e64871425796e44ef06c505c6d6762 +Subproject commit 24b3f92f9dd8cfcb9b29d27db64018be3c21950c