From e8099a713c5e8aa8132cfb6a15956a72ccb05d95 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 14 Sep 2022 14:17:25 +0200 Subject: [PATCH 1/3] Ensure that existing packages are not re-released Signed-off-by: Evan Lezar --- scripts/release-packages.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/scripts/release-packages.sh b/scripts/release-packages.sh index 2c020ebe..d15e2ae6 100755 --- a/scripts/release-packages.sh +++ b/scripts/release-packages.sh @@ -132,8 +132,17 @@ function sync() { done if [[ ${REPO} == "stable" ]]; then - cp ${src}/nvidia-container-runtime*.${pkg_type} ${dst} - cp ${src}/nvidia-docker*.${pkg_type} ${dst} + for f in $(ls ${src}/nvidia-container-runtime*.${pkg_type} ${src}/nvidia-docker*.${pkg_type}); do + df=${dst}/$(basename ${f}) + df_stable=${df//"/experimental/"/"/stable/"} + if [[ -f "${df}" ]]; then + echo "${df} already exists; skipping" + elif [[ ${REPO} == "experimental" && -f ${df_stable} ]]; then + echo "${df_stable} already exists; skipping" + else + cp ${f} ${df} + fi + done fi } From febce822d50d26c7d56689baecdb8013c984fbdf Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 14 Sep 2022 14:17:46 +0200 Subject: [PATCH 2/3] Fix fedora35 test container repo URL Signed-off-by: Evan Lezar --- test/release/docker/fedora35/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/release/docker/fedora35/Dockerfile b/test/release/docker/fedora35/Dockerfile index 0034246d..9dcd8a55 100644 --- a/test/release/docker/fedora35/Dockerfile +++ b/test/release/docker/fedora35/Dockerfile @@ -25,7 +25,7 @@ RUN fpm -s empty \ rm -f /tmp/docker.rpm -RUN curl -s -L https://nvidia.github.io/libnvidia-container/fedora35/nvidia-container-toolkit.repo \ +RUN curl -s -L https://nvidia.github.io/libnvidia-container/fedora35/libnvidia-container.repo \ | tee /etc/yum.repos.d/nvidia-container-toolkit.repo COPY entrypoint.sh / From 80a46d4a5c340ee7033055cdb114cf26413eabe4 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 14 Sep 2022 14:20:59 +0200 Subject: [PATCH 3/3] Bump version to 1.12.0-rc.1 This bumps the package versions to: * nvidia-container-toolkit 1.12.0-rc.1 * nvidia-container-runtime 3.12.0-rc.1 * nvidia-docker2 2.12.0-rc.1 Signed-off-by: Evan Lezar --- versions.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/versions.mk b/versions.mk index 55bd9040..cf7160e6 100644 --- a/versions.mk +++ b/versions.mk @@ -13,13 +13,14 @@ # limitations under the License. LIB_NAME := nvidia-container-toolkit -LIB_VERSION := 1.11.0 -LIB_TAG := +LIB_VERSION := 1.12.0 +LIB_TAG := rc.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.11.0 -NVIDIA_CONTAINER_RUNTIME_VERSION := 3.11.0 +# Note: The build tooling uses `LIB_TAG` above as the version tag. +# This is appended to the versions below if specified. +NVIDIA_DOCKER_VERSION := 2.12.0 +NVIDIA_CONTAINER_RUNTIME_VERSION := 3.12.0 # Specify the expected libnvidia-container0 version for arm64-based ubuntu builds. LIBNVIDIA_CONTAINER0_VERSION := 0.10.0+jetpack