Skip to content

Commit 8cfb3c2

Browse files
committed
Merge branch 'upstream-bump-v1.3.0' into 'master'
Bump to version 1.3.0 See merge request nvidia/container-toolkit/container-toolkit!22
2 parents 2666809 + 98e202d commit 8cfb3c2

File tree

4 files changed

+14
-3
lines changed

4 files changed

+14
-3
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ DIST_DIR ?= $(CURDIR)/dist
66

77
LIB_NAME := nvidia-container-toolkit
88
LIB_VERSION := 1.3.0
9-
LIB_TAG ?= rc.2
9+
LIB_TAG ?=
1010

1111
GOLANG_VERSION := 1.14.2
1212
GOLANG_PKG_PATH := github.com/NVIDIA/nvidia-container-toolkit/pkg

packaging/debian/changelog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
nvidia-container-toolkit (1.3.0-1) UNRELEASED; urgency=medium
2+
3+
* Promote 1.3.0~rc.2-1 to 1.3.0-1
4+
* Add dependence on libnvidia-container-tools >= 1.3.0
5+
6+
-- NVIDIA CORPORATION <[email protected]> Wed, 16 Sep 2020 13:40:29 -0700
7+
18
nvidia-container-toolkit (1.3.0~rc.2-1) experimental; urgency=medium
29

310
* 2c180947 Add more tests for new semantics with device list from volume mounts

packaging/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9)
1010

1111
Package: nvidia-container-toolkit
1212
Architecture: any
13-
Depends: ${misc:Depends}, libnvidia-container-tools (>= 1.2.0), libnvidia-container-tools (<< 2.0.0)
13+
Depends: ${misc:Depends}, libnvidia-container-tools (>= 1.3.0), libnvidia-container-tools (<< 2.0.0)
1414
Breaks: nvidia-container-runtime (<< 2.0.0), nvidia-container-runtime-hook
1515
Replaces: nvidia-container-runtime (<< 2.0.0), nvidia-container-runtime-hook
1616
Description: NVIDIA container runtime hook

packaging/rpm/SPECS/nvidia-container-toolkit.spec

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Source4: LICENSE
1818

1919
Obsoletes: nvidia-container-runtime < 2.0.0, nvidia-container-runtime-hook
2020
Provides: nvidia-container-runtime-hook
21-
Requires: libnvidia-container-tools >= 1.2.0, libnvidia-container-tools < 2.0.0
21+
Requires: libnvidia-container-tools >= 1.3.0, libnvidia-container-tools < 2.0.0
2222

2323
%description
2424
Provides a OCI hook to enable GPU support in containers.
@@ -53,6 +53,10 @@ rm -f %{_bindir}/nvidia-container-runtime-hook
5353
/usr/share/containers/oci/hooks.d/oci-nvidia-hook.json
5454

5555
%changelog
56+
* Wed Sep 16 2020 NVIDIA CORPORATION <[email protected]> 1.3.0-1
57+
- Promote 1.3.0-0.1.rc.2 to 1.3.0-1
58+
- Add dependence on libnvidia-container-tools >= 1.3.0
59+
5660
* Mon Aug 10 2020 NVIDIA CORPORATION <[email protected]> 1.3.0-0.1.rc.2
5761
- 2c180947 Add more tests for new semantics with device list from volume mounts
5862
- 7c003857 Refactor accepting device lists from volume mounts as a boolean

0 commit comments

Comments
 (0)