Merge branch 'bump-1.7.0' into 'master'

Evan Lezar · Evan Lezar · commit f10f533fb21e · 2021-11-30T18:37:01.000Z
Bump version to 1.7.0

See merge request nvidia/container-toolkit/container-toolkit!85
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
@@ -1,6 +1,9 @@
-nvidia-container-toolkit (1.7.0~rc.2-1) experimental; urgency=medium
+nvidia-container-toolkit (1.7.0-1) UNRELEASED; urgency=medium
 
- -- NVIDIA CORPORATION <cudatools@nvidia.com>  Mon, 29 Nov 2021 10:06:53 +0100
+  * Promote 1.7.0~rc.1-1 to 1.7.0-1
+  * Bump Golang version to 1.16.4
+
+ -- NVIDIA CORPORATION <cudatools@nvidia.com>  Tue, 30 Nov 2021 14:11:55 +0100
 
 nvidia-container-toolkit (1.7.0~rc.1-1) experimental; urgency=medium
 
diff --git a/packaging/rpm/SPECS/nvidia-container-toolkit.spec b/packaging/rpm/SPECS/nvidia-container-toolkit.spec
@@ -64,8 +64,9 @@ rm -f %{_bindir}/nvidia-container-runtime-hook
 /usr/share/containers/oci/hooks.d/oci-nvidia-hook.json
 
 %changelog
-* Mon Nov 29 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 1.7.0-0.1.rc.2
-- [Placeholder]
+* Tue Nov 30 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 1.7.0-1
+- Promote 1.7.0~rc.1-1 to 1.7.0-1
+- Bump Golang version to 1.16.4
 
 * Thu Nov 25 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 1.7.0-0.1.rc.1
 - Specify containerd runtime type as string in config tools to remove dependency on containerd package
diff --git a/third_party/libnvidia-container b/third_party/libnvidia-container
@@ -1 +1 @@
-Subproject commit e2d998c6a543bd03158a26c0a68af329ca1cc84e
+Subproject commit f37bb387ad05f6e501069d99e4135a97289faf1f
diff --git a/versions.mk b/versions.mk
@@ -14,11 +14,11 @@
 
 LIB_NAME := nvidia-container-toolkit
 LIB_VERSION := 1.7.0
-LIB_TAG := rc.2
+LIB_TAG :=
 
 # Specify the nvidia-docker2 and nvidia-container-runtime package versions
 NVIDIA_DOCKER_VERSION := 2.8.0
-NVIDIA_CONTAINER_RUNTIME_VERSION := 3.6.0
+NVIDIA_CONTAINER_RUNTIME_VERSION := 3.7.0
 
 CUDA_VERSION := 11.4.2
 GOLANG_VERSION := 1.16.4
