Skip to content

Commit 67ba352

Browse files
klueskaklueska
committed
Merge branch 'v1.2.0-rc.2' into 'master'
Bump version to 1.2.0-rc.2 See merge request nvidia/container-toolkit/libnvidia-container!28
2 parents 84a85a1 + 9478347 commit 67ba352

File tree

6 files changed

+52
-31
lines changed

6 files changed

+52
-31
lines changed

‎mk/Dockerfile.debian

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,9 @@ RUN make distclean && make -j"$(nproc)"
4040

4141
ENV DIST_DIR /dist
4242
VOLUME $DIST_DIR
43-
CMD make dist && make deb
43+
CMD bash -c " \
44+
export DISTRIB=$(lsb_release -c -s); \
45+
export SECTION="" \
46+
make dist; \
47+
make deb; \
48+
"

‎mk/Dockerfile.ubuntu

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,9 @@ RUN make distclean && make -j"$(nproc)"
3939

4040
ENV DIST_DIR /dist
4141
VOLUME $DIST_DIR
42-
CMD make dist && make deb
42+
CMD bash -c " \
43+
export DISTRIB=$(lsb_release -c -s); \
44+
export SECTION="" \
45+
make dist; \
46+
make deb; \
47+
"

‎mk/docker.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,6 @@ docker-build-%:
142142
--tag $(BUILDIMAGE) \
143143
--file $(DOCKERFILE) .
144144
$(DOCKER) run \
145-
-e DISTRIB \
146-
-e SECTION \
147145
-e TAG \
148146
-v $(ARTIFACTS_DIR):/dist \
149147
$(BUILDIMAGE)

‎pkg/deb/changelog

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1-
libnvidia-container (1.2.0~rc.1-1) UNRELEASED; urgency=medium
1+
libnvidia-container (1.2.0~rc.2-1) experimental; urgency=medium
2+
3+
* 4ea9b59f Update debian based dockerfiles to set distribution in changelog
4+
* a57fcea5 Add 'ngx' as a new capability for a container
5+
* 6f16ccd3 Allow --mig-monitor and --mig-config on machines without MIG capable GPUs
6+
7+
-- NVIDIA CORPORATION <[email protected]> Thu, 18 Jun 2020 21:09:59 -0700
8+
9+
libnvidia-container (1.2.0~rc.1-1) experimental; urgency=medium
210

311
* 4263e684 Add support for Windows Subsystem for Linux (WSL2)
4-
* 2b75a55e Fix ability to build RC packages via TAG=rc.<num>
12+
* e768f8bc Fix ability to build RC packages via TAG=rc.<num>
513

614
-- NVIDIA CORPORATION <[email protected]> Thu, 11 Jun 2020 15:12:59 -0700
715

‎pkg/deb/libnvidia-container@[email protected]

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
libnvidia-container.so.1 libnvidia-container1 #MINVER#
2-
NVC_1.0@NVC_1.0 1.2.0~rc.1
3-
nvc_config_free@NVC_1.0 1.2.0~rc.1
4-
nvc_config_new@NVC_1.0 1.2.0~rc.1
5-
nvc_container_config_free@NVC_1.0 1.2.0~rc.1
6-
nvc_container_config_new@NVC_1.0 1.2.0~rc.1
7-
nvc_container_free@NVC_1.0 1.2.0~rc.1
8-
nvc_container_new@NVC_1.0 1.2.0~rc.1
9-
nvc_context_free@NVC_1.0 1.2.0~rc.1
10-
nvc_context_new@NVC_1.0 1.2.0~rc.1
11-
nvc_device_info_free@NVC_1.0 1.2.0~rc.1
12-
nvc_device_info_new@NVC_1.0 1.2.0~rc.1
13-
nvc_device_mount@NVC_1.0 1.2.0~rc.1
14-
nvc_mig_device_access_caps_mount@NVC_1.0 1.2.0~rc.1
15-
nvc_mig_config_global_caps_mount@NVC_1.0 1.2.0~rc.1
16-
nvc_mig_monitor_global_caps_mount@NVC_1.0 1.2.0~rc.1
17-
nvc_device_mig_caps_mount@NVC_1.0 1.2.0~rc.1
18-
nvc_driver_info_free@NVC_1.0 1.2.0~rc.1
19-
nvc_driver_info_new@NVC_1.0 1.2.0~rc.1
20-
nvc_driver_mount@NVC_1.0 1.2.0~rc.1
21-
nvc_error@NVC_1.0 1.2.0~rc.1
22-
nvc_init@NVC_1.0 1.2.0~rc.1
23-
nvc_ldcache_update@NVC_1.0 1.2.0~rc.1
24-
nvc_shutdown@NVC_1.0 1.2.0~rc.1
25-
nvc_version@NVC_1.0 1.2.0~rc.1
2+
NVC_1.0@NVC_1.0 1.2.0~rc.2
3+
nvc_config_free@NVC_1.0 1.2.0~rc.2
4+
nvc_config_new@NVC_1.0 1.2.0~rc.2
5+
nvc_container_config_free@NVC_1.0 1.2.0~rc.2
6+
nvc_container_config_new@NVC_1.0 1.2.0~rc.2
7+
nvc_container_free@NVC_1.0 1.2.0~rc.2
8+
nvc_container_new@NVC_1.0 1.2.0~rc.2
9+
nvc_context_free@NVC_1.0 1.2.0~rc.2
10+
nvc_context_new@NVC_1.0 1.2.0~rc.2
11+
nvc_device_info_free@NVC_1.0 1.2.0~rc.2
12+
nvc_device_info_new@NVC_1.0 1.2.0~rc.2
13+
nvc_device_mount@NVC_1.0 1.2.0~rc.2
14+
nvc_mig_device_access_caps_mount@NVC_1.0 1.2.0~rc.2
15+
nvc_mig_config_global_caps_mount@NVC_1.0 1.2.0~rc.2
16+
nvc_mig_monitor_global_caps_mount@NVC_1.0 1.2.0~rc.2
17+
nvc_device_mig_caps_mount@NVC_1.0 1.2.0~rc.2
18+
nvc_driver_info_free@NVC_1.0 1.2.0~rc.2
19+
nvc_driver_info_new@NVC_1.0 1.2.0~rc.2
20+
nvc_driver_mount@NVC_1.0 1.2.0~rc.2
21+
nvc_error@NVC_1.0 1.2.0~rc.2
22+
nvc_init@NVC_1.0 1.2.0~rc.2
23+
nvc_ldcache_update@NVC_1.0 1.2.0~rc.2
24+
nvc_shutdown@NVC_1.0 1.2.0~rc.2
25+
nvc_version@NVC_1.0 1.2.0~rc.2

‎pkg/rpm/SPECS/libnvidia-container.spec

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,14 @@ This package contains command-line tools that facilitate using the library.
8787
%{_bindir}/*
8888

8989
%changelog
90+
* Thu Jun 18 2020 NVIDIA CORPORATION <[email protected]> 1.2.0-0.1.rc.2
91+
- 4ea9b59f Update debian based dockerfiles to set distribution in changelog
92+
- a57fcea5 Add 'ngx' as a new capability for a container
93+
- 6f16ccd3 Allow --mig-monitor and --mig-config on machines without MIG capable GPUs
94+
9095
* Thu Jun 11 2020 NVIDIA CORPORATION <[email protected]> 1.2.0-0.1.rc.1
9196
- 4263e684 Add support for Windows Subsystem for Linux (WSL2)
92-
- 2b75a55e Fix ability to build RC packages via TAG=rc.<num>
97+
- e768f8bc Fix ability to build RC packages via TAG=rc.<num>
9398

9499
* Tue May 19 2020 NVIDIA CORPORATION <[email protected]> 1.1.1-1
95100
- deeb499 Fixup deb packaging files to remove warnings

0 commit comments

Comments
 (0)