UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2024-11-26 05:49:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Override LIB_TAGS for runtime and docker wrapper

Browse Source 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2021-11-24 10:56:51 +01:00
parent a4441b6545
commit 7a34be62b2
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/build-all-components.sh
View File

@ -59,15 +59,18 @@ if [[ -z ${NVIDIA_CONTAINER_TOOLKIT_VERSION} ]]; then
eval $(${SCRIPTS_DIR}/get-component-versions.sh) eval $(${SCRIPTS_DIR}/get-component-versions.sh)
fi 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 # Build nvidia-container-runtime
make -C ${NVIDIA_CONTAINER_RUNTIME_ROOT} \ make -C ${NVIDIA_CONTAINER_RUNTIME_ROOT} \
LIB_TAG="${NVIDIA_CONTAINER_TOOLKIT_TAG}" \
TOOLKIT_VERSION="${NVIDIA_CONTAINER_TOOLKIT_VERSION}" \ TOOLKIT_VERSION="${NVIDIA_CONTAINER_TOOLKIT_VERSION}" \
TOOLKIT_TAG="${NVIDIA_CONTAINER_TOOLKIT_TAG}" \ TOOLKIT_TAG="${NVIDIA_CONTAINER_TOOLKIT_TAG}" \
${TARGET} ${TARGET}
# Build nvidia-docker2 # Build nvidia-docker2
make -C ${NVIDIA_DOCKER_ROOT} \ make -C ${NVIDIA_DOCKER_ROOT} \
LIB_TAG="${NVIDIA_CONTAINER_TOOLKIT_TAG}" \
TOOLKIT_VERSION="${NVIDIA_CONTAINER_TOOLKIT_VERSION}" \ TOOLKIT_VERSION="${NVIDIA_CONTAINER_TOOLKIT_VERSION}" \
TOOLKIT_TAG="${NVIDIA_CONTAINER_TOOLKIT_TAG}" \ TOOLKIT_TAG="${NVIDIA_CONTAINER_TOOLKIT_TAG}" \
${TARGET} ${TARGET}

10
scripts/release.sh
View File

@ -56,16 +56,6 @@ eval $(${SCRIPTS_DIR}/get-component-versions.sh)
export NVIDIA_CONTAINER_TOOLKIT_VERSION export NVIDIA_CONTAINER_TOOLKIT_VERSION
export NVIDIA_CONTAINER_TOOLKIT_TAG 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 for target in ${targets[@]}; do
${SCRIPTS_DIR}/build-all-components.sh ${target} ${SCRIPTS_DIR}/build-all-components.sh ${target}
done done

2
third_party/libnvidia-container vendored

@ -1 +1 @@
Subproject commit dd2c49d6699e4d8529fbeaa58ee91554977b652e Subproject commit a648cd2a698eb56d71150d8790d96e445f9ae351