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

mk/Dockerfile.debian

@@ -40,4 +40,9 @@ RUN make distclean && make -j"$(nproc)"
 
 ENV DIST_DIR /dist
 VOLUME $DIST_DIR
-CMD make dist && make deb
+CMD bash -c " \
+        export DISTRIB=$(lsb_release -c -s); \
+        export SECTION="" \
+        make dist; \
+        make deb; \
+     "

mk/Dockerfile.ubuntu

@@ -39,4 +39,9 @@ RUN make distclean && make -j"$(nproc)"
 
 ENV DIST_DIR /dist
 VOLUME $DIST_DIR
-CMD make dist && make deb
+CMD bash -c " \
+        export DISTRIB=$(lsb_release -c -s); \
+        export SECTION="" \
+        make dist; \
+        make deb; \
+     "

mk/docker.mk

@@ -142,8 +142,6 @@ docker-build-%:
 	    --tag $(BUILDIMAGE) \
 	    --file $(DOCKERFILE) .
 	$(DOCKER) run \
-	    -e DISTRIB \
-	    -e SECTION \
 	    -e TAG \
 	    -v $(ARTIFACTS_DIR):/dist \
 	    $(BUILDIMAGE)

pkg/deb/changelog

@@ -1,7 +1,15 @@
-libnvidia-container (1.2.0~rc.1-1) UNRELEASED; urgency=medium
+libnvidia-container (1.2.0~rc.2-1) experimental; urgency=medium
+
+  * 4ea9b59f Update debian based dockerfiles to set distribution in changelog
+  * a57fcea5 Add 'ngx' as a new capability for a container
+  * 6f16ccd3 Allow --mig-monitor and --mig-config on machines without MIG capable GPUs
+
+ -- NVIDIA CORPORATION <[email protected]>  Thu, 18 Jun 2020 21:09:59 -0700
+
+libnvidia-container (1.2.0~rc.1-1) experimental; urgency=medium
 
   * 4263e684 Add support for Windows Subsystem for Linux (WSL2)
-  * 2b75a55e Fix ability to build RC packages via TAG=rc.<num>
+  * e768f8bc Fix ability to build RC packages via TAG=rc.<num>
 
  -- NVIDIA CORPORATION <[email protected]>  Thu, 11 Jun 2020 15:12:59 -0700
 

pkg/deb/libnvidia-container@MAJOR@.symbols

@@ -1,25 +1,25 @@
 libnvidia-container.so.1 libnvidia-container1 #MINVER#
- NVC_1.0@NVC_1.0 1.2.0~rc.1
- nvc_config_free@NVC_1.0 1.2.0~rc.1
- nvc_config_new@NVC_1.0 1.2.0~rc.1
- nvc_container_config_free@NVC_1.0 1.2.0~rc.1
- nvc_container_config_new@NVC_1.0 1.2.0~rc.1
- nvc_container_free@NVC_1.0 1.2.0~rc.1
- nvc_container_new@NVC_1.0 1.2.0~rc.1
- nvc_context_free@NVC_1.0 1.2.0~rc.1
- nvc_context_new@NVC_1.0 1.2.0~rc.1
- nvc_device_info_free@NVC_1.0 1.2.0~rc.1
- nvc_device_info_new@NVC_1.0 1.2.0~rc.1
- nvc_device_mount@NVC_1.0 1.2.0~rc.1
- nvc_mig_device_access_caps_mount@NVC_1.0 1.2.0~rc.1
- nvc_mig_config_global_caps_mount@NVC_1.0 1.2.0~rc.1
- nvc_mig_monitor_global_caps_mount@NVC_1.0 1.2.0~rc.1
- nvc_device_mig_caps_mount@NVC_1.0 1.2.0~rc.1
- nvc_driver_info_free@NVC_1.0 1.2.0~rc.1
- nvc_driver_info_new@NVC_1.0 1.2.0~rc.1
- nvc_driver_mount@NVC_1.0 1.2.0~rc.1
- nvc_error@NVC_1.0 1.2.0~rc.1
- nvc_init@NVC_1.0 1.2.0~rc.1
- nvc_ldcache_update@NVC_1.0 1.2.0~rc.1
- nvc_shutdown@NVC_1.0 1.2.0~rc.1
- nvc_version@NVC_1.0 1.2.0~rc.1
+ NVC_1.0@NVC_1.0 1.2.0~rc.2
+ nvc_config_free@NVC_1.0 1.2.0~rc.2
+ nvc_config_new@NVC_1.0 1.2.0~rc.2
+ nvc_container_config_free@NVC_1.0 1.2.0~rc.2
+ nvc_container_config_new@NVC_1.0 1.2.0~rc.2
+ nvc_container_free@NVC_1.0 1.2.0~rc.2
+ nvc_container_new@NVC_1.0 1.2.0~rc.2
+ nvc_context_free@NVC_1.0 1.2.0~rc.2
+ nvc_context_new@NVC_1.0 1.2.0~rc.2
+ nvc_device_info_free@NVC_1.0 1.2.0~rc.2
+ nvc_device_info_new@NVC_1.0 1.2.0~rc.2
+ nvc_device_mount@NVC_1.0 1.2.0~rc.2
+ nvc_mig_device_access_caps_mount@NVC_1.0 1.2.0~rc.2
+ nvc_mig_config_global_caps_mount@NVC_1.0 1.2.0~rc.2
+ nvc_mig_monitor_global_caps_mount@NVC_1.0 1.2.0~rc.2
+ nvc_device_mig_caps_mount@NVC_1.0 1.2.0~rc.2
+ nvc_driver_info_free@NVC_1.0 1.2.0~rc.2
+ nvc_driver_info_new@NVC_1.0 1.2.0~rc.2
+ nvc_driver_mount@NVC_1.0 1.2.0~rc.2
+ nvc_error@NVC_1.0 1.2.0~rc.2
+ nvc_init@NVC_1.0 1.2.0~rc.2
+ nvc_ldcache_update@NVC_1.0 1.2.0~rc.2
+ nvc_shutdown@NVC_1.0 1.2.0~rc.2
+ nvc_version@NVC_1.0 1.2.0~rc.2

pkg/rpm/SPECS/libnvidia-container.spec

@@ -87,9 +87,14 @@ This package contains command-line tools that facilitate using the library.
 %{_bindir}/*
 
 %changelog
+* Thu Jun 18 2020 NVIDIA CORPORATION <[email protected]> 1.2.0-0.1.rc.2
+- 4ea9b59f Update debian based dockerfiles to set distribution in changelog
+- a57fcea5 Add 'ngx' as a new capability for a container
+- 6f16ccd3 Allow --mig-monitor and --mig-config on machines without MIG capable GPUs
+
 * Thu Jun 11 2020 NVIDIA CORPORATION <[email protected]> 1.2.0-0.1.rc.1
 - 4263e684 Add support for Windows Subsystem for Linux (WSL2)
-- 2b75a55e Fix ability to build RC packages via TAG=rc.<num>
+- e768f8bc Fix ability to build RC packages via TAG=rc.<num>
 
 * Tue May 19 2020 NVIDIA CORPORATION <[email protected]> 1.1.1-1
 - deeb499 Fixup deb packaging files to remove warnings