From 7a34be62b2cf4976cd5b63041a2e1aacbbd2d379 Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Wed, 24 Nov 2021 10:56:51 +0100
Subject: [PATCH] Override LIB_TAGS for runtime and docker wrapper

Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
 scripts/build-all-components.sh |  5 ++++-
 scripts/release.sh              | 10 ----------
 third_party/libnvidia-container |  2 +-
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/scripts/build-all-components.sh b/scripts/build-all-components.sh
index a3de5fe4..a8400f8f 100755
--- a/scripts/build-all-components.sh
+++ b/scripts/build-all-components.sh
@@ -59,15 +59,18 @@ if [[ -z ${NVIDIA_CONTAINER_TOOLKIT_VERSION} ]]; then
 eval $(${SCRIPTS_DIR}/get-component-versions.sh)
 fi
 
-# We set the TOOLKIT_VERSION for the nvidia-container-runtime and nvidia-docker targets
+# We set the TOOLKIT_VERSION, TOOLKIT_TAG for the nvidia-container-runtime and nvidia-docker targets
+# The LIB_TAG is also overridden to match the TOOLKIT_TAG.
 # Build nvidia-container-runtime
 make -C ${NVIDIA_CONTAINER_RUNTIME_ROOT} \
+    LIB_TAG="${NVIDIA_CONTAINER_TOOLKIT_TAG}" \
     TOOLKIT_VERSION="${NVIDIA_CONTAINER_TOOLKIT_VERSION}" \
     TOOLKIT_TAG="${NVIDIA_CONTAINER_TOOLKIT_TAG}" \
         ${TARGET}
 
 # Build nvidia-docker2
 make -C ${NVIDIA_DOCKER_ROOT} \
+    LIB_TAG="${NVIDIA_CONTAINER_TOOLKIT_TAG}" \
     TOOLKIT_VERSION="${NVIDIA_CONTAINER_TOOLKIT_VERSION}" \
     TOOLKIT_TAG="${NVIDIA_CONTAINER_TOOLKIT_TAG}" \
         ${TARGET}
diff --git a/scripts/release.sh b/scripts/release.sh
index 3341c7f0..e436d899 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -56,16 +56,6 @@ eval $(${SCRIPTS_DIR}/get-component-versions.sh)
 export NVIDIA_CONTAINER_TOOLKIT_VERSION
 export NVIDIA_CONTAINER_TOOLKIT_TAG
 
-if [[ "${NVIDIA_CONTAINER_TOOLKIT_TAG}" != "${NVIDIA_CONTAINER_RUNTIME_TAG}" ]]; then
-    echo "ERROR: The nvidia-container-runtime and nvidia-container-toolkit version tags do not match"
-    exit  1
-fi
-
-if [[ "${NVIDIA_CONTAINER_TOOLKIT_TAG}" != "${NVIDIA_DOCKER_TAG}" ]]; then
-    echo "ERROR: The nvidia-docker and nvidia-container-toolkit version tags do not match"
-    exit 1
-fi
-
 for target in ${targets[@]}; do
     ${SCRIPTS_DIR}/build-all-components.sh ${target}
 done
diff --git a/third_party/libnvidia-container b/third_party/libnvidia-container
index dd2c49d6..a648cd2a 160000
--- a/third_party/libnvidia-container
+++ b/third_party/libnvidia-container
@@ -1 +1 @@
-Subproject commit dd2c49d6699e4d8529fbeaa58ee91554977b652e
+Subproject commit a648cd2a698eb56d71150d8790d96e445f9ae351