Merge branch 'upstream-bump-v2.5.0' into 'master'

Bump to version 2.5.0

See merge request nvidia/container-toolkit/nvidia-docker!15

Makefile

@@ -5,10 +5,10 @@ MKDIR  ?= mkdir
 DIST_DIR ?= $(CURDIR)/dist
 
 LIB_NAME := nvidia-docker2
-LIB_VERSION := 2.4.0
+LIB_VERSION := 2.5.0
 PKG_REV := 1
 
-RUNTIME_VERSION := 3.3.0
+RUNTIME_VERSION := 3.4.0
 
 # Supported OSs by architecture
 AMD64_TARGETS := ubuntu20.04 ubuntu18.04 ubuntu16.04 debian10 debian9

debian/changelog

@@ -1,3 +1,12 @@
+nvidia-docker2 (2.5.0-1) UNRELEASED; urgency=medium
+
+  * Bump version to v2.5.0
+  * Add dependence on nvidia-container-runtime >= 3.4.0
+  * Update readme to point to the official documentatio
+  * Add %config directive to daemon.json for RPM installations
+
+ -- NVIDIA CORPORATION <cudatools@nvidia.com>  Wed, 16 Sep 2020 13:55:52 +0000
+
 nvidia-docker2 (2.4.0-1) UNRELEASED; urgency=medium
 
   * 09a01276 Update package license to match source license

rpm/SPECS/nvidia-docker2.spec

@@ -34,9 +34,15 @@ install -m 644 -t %{buildroot}/etc/docker daemon.json
 %files
 %license LICENSE
 %{_bindir}/nvidia-docker
-/etc/docker/daemon.json
+%config /etc/docker/daemon.json
 
 %changelog
+* Wed Sep 16 2020 NVIDIA CORPORATION <cudatools@nvidia.com> 2.5.0-1
+- Bump version to v2.5.0
+- Add dependence on nvidia-container-runtime >= 3.4.0
+- Update readme to point to the official documentatio
+- Add %config directive to daemon.json for RPM installations
+
 * Wed Jul 08 2020 NVIDIA CORPORATION <cudatools@nvidia.com> 2.4.0-1
 - 09a01276 Update package license to match source license
 - b9c70155 Update dependence on nvidia-container-runtime to 3.3.0