Merge branch 'match-toolkit-tag' into 'master'

Ensure that package tags for components match See merge request nvidia/container-toolkit/container-toolkit!76
NVIDIA · Nov 16, 2021 · d2575ab · d2575ab
2 parents 81f9caa + bc1f6e0
commit d2575ab
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/scripts/get-component-versions.sh b/scripts/get-component-versions.sh
@@ -60,4 +60,6 @@ if [[ "${libnvidia_container_version_tag}" != "${nvidia_container_toolkit_versio
     >&2 echo "WARNING: The libnvidia-container and nvidia-container-toolkit versions do not match"
 fi
 echo "NVIDIA_CONTAINER_RUNTIME_VERSION=${nvidia_container_runtime_version}"
+echo "NVIDIA_CONTAINER_RUNTIME_TAG=${nvidia_container_runtime_tag}"
 echo "NVIDIA_DOCKER_VERSION=${nvidia_docker_version}"
+echo "NVIDIA_DOCKER_TAG=${nvidia_docker_tag}"
diff --git a/scripts/release.sh b/scripts/release.sh
@@ -56,6 +56,16 @@ 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/nvidia-container-runtime b/third_party/nvidia-container-runtime
diff --git a/third_party/nvidia-docker b/third_party/nvidia-docker