UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2025-05-24 21:25:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into experimental

Browse Source
This commit is contained in:
Evan Lezar 2021-11-16 13:52:58 +01:00
commit d81329da1f
9 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -18,7 +18,7 @@ DIST_DIR ?= $(CURDIR)/dist
LIB_NAME := nvidia-container-toolkit LIB_NAME := nvidia-container-toolkit
LIB_VERSION := 1.6.0 LIB_VERSION := 1.6.0
LIB_TAG ?= rc.2 LIB_TAG ?= rc.3
GOLANG_VERSION := 1.16.3 GOLANG_VERSION := 1.16.3
MODULE := github.com/NVIDIA/nvidia-container-toolkit MODULE := github.com/NVIDIA/nvidia-container-toolkit

2
build/container/Makefile
View File

@ -21,7 +21,7 @@ DIST_DIR ?= $(CURDIR)/dist
# TODO: These should be defined ONCE and currently duplicate the version in the # TODO: These should be defined ONCE and currently duplicate the version in the
# toolkit makefile. # toolkit makefile.
LIB_VERSION := 1.6.0 LIB_VERSION := 1.6.0
LIB_TAG := rc.2 LIB_TAG := rc.3
VERSION ?= $(LIB_VERSION)$(if $(LIB_TAG),-$(LIB_TAG)) VERSION ?= $(LIB_VERSION)$(if $(LIB_TAG),-$(LIB_TAG))

8
packaging/debian/changelog
View File

@ -1,8 +1,14 @@
nvidia-container-toolkit (1.6.0~rc.3-1) experimental; urgency=medium
* Move OCI and command line checks for runtime to internal oci package
-- NVIDIA CORPORATION <cudatools@nvidia.com> Mon, 15 Nov 2021 13:02:23 +0100
nvidia-container-toolkit (1.6.0~rc.2-1) experimental; urgency=medium nvidia-container-toolkit (1.6.0~rc.2-1) experimental; urgency=medium
* Use relative path to OCI specification file (config.json) if bundle path is not specified as an argument to the nvidia-container-runtime * Use relative path to OCI specification file (config.json) if bundle path is not specified as an argument to the nvidia-container-runtime
-- NVIDIA CORPORATION <cudatools@nvidia.com> Tue, 26 Oct 2021 12:24:05 +0200 -- NVIDIA CORPORATION <cudatools@nvidia.com> Fri, 05 Nov 2021 12:24:05 +0200
nvidia-container-toolkit (1.6.0~rc.1-1) experimental; urgency=medium nvidia-container-toolkit (1.6.0~rc.1-1) experimental; urgency=medium

5
packaging/rpm/SPECS/nvidia-container-toolkit.spec
View File

@ -64,8 +64,11 @@ rm -f %{_bindir}/nvidia-container-runtime-hook
/usr/share/containers/oci/hooks.d/oci-nvidia-hook.json /usr/share/containers/oci/hooks.d/oci-nvidia-hook.json
%changelog %changelog
* Mon Nov 15 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 1.6.0-0.1.rc.3
* Tue Oct 26 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 1.6.0-0.1.rc.2 - Move OCI and command line checks for runtime to internal oci package
* Fri Nov 05 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 1.6.0-0.1.rc.2
- Use relative path to OCI specification file (config.json) if bundle path is not specified as an argument to the nvidia-container-runtime - Use relative path to OCI specification file (config.json) if bundle path is not specified as an argument to the nvidia-container-runtime

2
scripts/get-component-versions.sh
View File

@ -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" >&2 echo "WARNING: The libnvidia-container and nvidia-container-toolkit versions do not match"
fi fi
echo "NVIDIA_CONTAINER_RUNTIME_VERSION=${nvidia_container_runtime_version}" 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_VERSION=${nvidia_docker_version}"
echo "NVIDIA_DOCKER_TAG=${nvidia_docker_tag}"

10
scripts/release.sh
View File

@ -55,6 +55,16 @@ 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 badec1fa4a2c085aa9396f95b6bb1d69f1c7996b Subproject commit ff6ed3d5637f0537c4951a2757512108cc0ae147

2
third_party/nvidia-container-runtime vendored

@ -1 +1 @@
Subproject commit 037ec4c39a2fe28c3c8d4992a269a9d7bbbeafa7 Subproject commit ba4815e7eb31c23d839d58c94623ec53f4e8d368

2
third_party/nvidia-docker vendored

@ -1 +1 @@
Subproject commit 9de312f595157d2176a8a3ada8a1b5bb62414578 Subproject commit 34934c282707a1dc3f4341ead20a9e40d36ee618