From 77cf70b625d3f8ae5cc1972b4d8d2a16434fd4cc Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 18 May 2022 13:54:26 +0200 Subject: [PATCH 1/5] Move debian changelog to CHANGELOG.md Signed-off-by: Evan Lezar --- packaging/debian/changelog => CHANGELOG.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packaging/debian/changelog => CHANGELOG.md (100%) diff --git a/packaging/debian/changelog b/CHANGELOG.md similarity index 100% rename from packaging/debian/changelog rename to CHANGELOG.md From a0a00e38fddc3824351c35f2a7800c3bf38f3e8c Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 18 May 2022 14:00:01 +0200 Subject: [PATCH 2/5] Format CHANGELOG.md as markdown Signed-off-by: Evan Lezar --- CHANGELOG.md | 267 ++++++++++++++++++++------------------------------- 1 file changed, 106 insertions(+), 161 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f1a6d01..c9445d9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,217 +1,162 @@ -nvidia-container-toolkit (1.10.0~rc.3-1) experimental; urgency=medium +# NVIDIA Container Toolkit Changelog - * [libnvida-container] Fix bug introduced when adding libcudadebugger.so to list of libraries +## v1.10.0-rc.3 - -- NVIDIA CORPORATION Tue, 17 May 2022 13:21:50 +0200 +* [libnvida-container] Fix bug introduced when adding libcudadebugger.so to list of libraries -nvidia-container-toolkit (1.10.0~rc.2-1) experimental; urgency=medium +## v1.10.0-rc.2 - * Add support for NVIDIA_REQUIRE_* checks for cuda version and arch to csv mode - * Switch to debug logging to reduce log verbosity - * Support logging to logs requested in command line - * Fix bug when launching containers with relative root path (e.g. using containerd) - * Allow low-level runtime path to be set explicitly as nvidia-container-runtime.runtimes option - * Fix failure to locate low-level runtime if PATH envvar is unset - * Replace experimental option for NVIDIA Container Runtime with nvidia-container-runtime.mode = csv option - * Use csv as default mode on Tegra systems without NVML - * Add --version flag to all CLIs - * [libnvidia-container] Bump libtirpc to 1.3.2 - * [libnvidia-container] Fix bug when running host ldconfig using glibc compiled with a non-standard prefix - * [libnvidia-container] Add libcudadebugger.so to list of compute libraries +* Add support for NVIDIA_REQUIRE_* checks for cuda version and arch to csv mode +* Switch to debug logging to reduce log verbosity +* Support logging to logs requested in command line +* Fix bug when launching containers with relative root path (e.g. using containerd) +* Allow low-level runtime path to be set explicitly as nvidia-container-runtime.runtimes option +* Fix failure to locate low-level runtime if PATH envvar is unset +* Replace experimental option for NVIDIA Container Runtime with nvidia-container-runtime.mode = csv option +* Use csv as default mode on Tegra systems without NVML +* Add --version flag to all CLIs +* [libnvidia-container] Bump libtirpc to 1.3.2 +* [libnvidia-container] Fix bug when running host ldconfig using glibc compiled with a non-standard prefix +* [libnvidia-container] Add libcudadebugger.so to list of compute libraries - -- NVIDIA CORPORATION Fri, 13 May 2022 13:41:10 +0200 +## v1.10.0-rc.1 -nvidia-container-toolkit (1.10.0~rc.1-1) experimental; urgency=medium +* Include nvidia-ctk CLI in installed binaries +* Add experimental option to NVIDIA Container Runtime - * Include nvidia-ctk CLI in installed binaries - * Add experimental option to NVIDIA Container Runtime +## v1.9.0 - -- NVIDIA CORPORATION Thu, 24 Mar 2022 13:22:24 +0200 +* [libnvidia-container] Add additional check for Tegra in /sys/.../family file in CLI +* [libnvidia-container] Update jetpack-specific CLI option to only load Base CSV files by default +* [libnvidia-container] Fix bug (from 1.8.0) when mounting GSP firmware into containers without /lib to /usr/lib symlinks +* [libnvidia-container] Update nvml.h to CUDA 11.6.1 nvML_DEV 11.6.55 +* [libnvidia-container] Update switch statement to include new brands from latest nvml.h +* [libnvidia-container] Process all --require flags on Jetson platforms +* [libnvidia-container] Fix long-standing issue with running ldconfig on Debian systems -nvidia-container-toolkit (1.9.0-1) UNRELEASED; urgency=medium +## v1.8.1 - * [libnvidia-container] Add additional check for Tegra in /sys/.../family file in CLI - * [libnvidia-container] Update jetpack-specific CLI option to only load Base CSV files by default - * [libnvidia-container] Fix bug (from 1.8.0) when mounting GSP firmware into containers without /lib to /usr/lib symlinks - * [libnvidia-container] Update nvml.h to CUDA 11.6.1 nvML_DEV 11.6.55 - * [libnvidia-container] Update switch statement to include new brands from latest nvml.h - * [libnvidia-container] Process all --require flags on Jetson platforms - * [libnvidia-container] Fix long-standing issue with running ldconfig on Debian systems +* [libnvidia-container] Fix bug in determining cgroup root when running in nested containers +* [libnvidia-container] Fix permission issue when determining cgroup version - -- NVIDIA CORPORATION Fri, 18 Mar 2022 06:10:56 +0200 +## v1.8.0 -nvidia-container-toolkit (1.8.1-1) UNRELEASED; urgency=medium +* Promote 1.8.0-rc.2-1 to 1.8.0 - * [libnvidia-container] Fix bug in determining cgroup root when running in nested containers - * [libnvidia-container] Fix permission issue when determining cgroup version +## v1.8.0-rc.2 - -- NVIDIA CORPORATION Mon, 14 Feb 2022 09:53:26 +0100 +* Remove support for building amazonlinux1 packages -nvidia-container-toolkit (1.8.0-1) UNRELEASED; urgency=medium +## v1.8.0-rc.1 - * Promote 1.8.0~rc.2-1 to 1.8.0-1 +* [libnvidia-container] Add support for cgroupv2 +* Release toolkit-container images from nvidia-container-toolkit repository - -- NVIDIA CORPORATION Fri, 04 Feb 2022 06:04:39 +0100 +## v1.7.0 -nvidia-container-toolkit (1.8.0~rc.2-1) UNRELEASED; urgency=medium +* Promote 1.7.0-rc.1-1 to 1.7.0 + * Bump Golang version to 1.16.4 - * Remove support for building amazonlinux1 packages +## v1.7.0-rc.1 - -- NVIDIA CORPORATION Thu, 20 Jan 2022 13:38:48 +0100 +* Specify containerd runtime type as string in config tools to remove dependency on containerd package +* Add supported-driver-capabilities config option to allow for a subset of all driver capabilities to be specified -nvidia-container-toolkit (1.8.0~rc.1-1) UNRELEASED; urgency=medium +## v1.6.0 - * [libnvidia-container] Add support for cgroupv2 - * Release toolkit-container images from nvidia-container-toolkit repository +* Promote 1.6.0-rc.3-1 to 1.6.0 + * Fix unnecessary logging to stderr instead of configured nvidia-container-runtime log file - -- NVIDIA CORPORATION Wed, 08 Dec 2021 12:56:49 +0100 +## v1.6.0-rc.3 -nvidia-container-toolkit (1.7.0-1) UNRELEASED; urgency=medium +* Add supported-driver-capabilities config option to the nvidia-container-toolkit +* Move OCI and command line checks for runtime to internal oci package - * Promote 1.7.0~rc.1-1 to 1.7.0-1 - * Bump Golang version to 1.16.4 +## v1.6.0-rc.2 - -- NVIDIA CORPORATION Tue, 30 Nov 2021 14:11:55 +0100 +* Use relative path to OCI specification file (config.json) if bundle path is not specified as an argument to the nvidia-container-runtime -nvidia-container-toolkit (1.7.0~rc.1-1) experimental; urgency=medium +## v1.6.0-rc.1 - * Specify containerd runtime type as string in config tools to remove dependency on containerd package - * Add supported-driver-capabilities config option to allow for a subset of all driver capabilities to be specified +* Add AARCH64 package for Amazon Linux 2 +* Include nvidia-container-runtime into nvidia-container-toolkit package - -- NVIDIA CORPORATION Thu, 25 Nov 2021 11:36:29 +0100 +## v1.5.1 -nvidia-container-toolkit (1.6.0-1) UNRELEASED; urgency=medium +* Fix bug where Docker Swarm device selection is ignored if NVIDIA_VISIBLE_DEVICES is also set +* Improve unit testing by using require package and adding coverage reports +* Remove unneeded go dependencies by running go mod tidy +* Move contents of pkg directory to cmd for CLI tools +* Ensure make binary target explicitly sets GOOS - * Promote 1.6.0~rc.3-1 to 1.6.0-1 - * Fix unnecessary logging to stderr instead of configured nvidia-container-runtime log file +## v1.5.0 - -- NVIDIA CORPORATION Wed, 17 Nov 2021 09:25:15 +0100 +* Add dependence on libnvidia-container-tools >= 1.4.0 +* Add golang check targets to Makefile +* Add Jenkinsfile definition for build targets +* Move docker.mk to docker folder -nvidia-container-toolkit (1.6.0~rc.3-1) experimental; urgency=medium +## v1.4.2 - * Add supported-driver-capabilities config option to the nvidia-container-toolkit - * Move OCI and command line checks for runtime to internal oci package +* Add dependence on libnvidia-container-tools >= 1.3.3 - -- NVIDIA CORPORATION Mon, 15 Nov 2021 13:02:23 +0100 +## v1.4.1 -nvidia-container-toolkit (1.6.0~rc.2-1) experimental; urgency=medium +* Ignore NVIDIA_VISIBLE_DEVICES for containers with insufficent privileges +* Add dependence on libnvidia-container-tools >= 1.3.2 - * Use relative path to OCI specification file (config.json) if bundle path is not specified as an argument to the nvidia-container-runtime +## v1.4.0 - -- NVIDIA CORPORATION Fri, 05 Nov 2021 12:24:05 +0200 +* Add 'compute' capability to list of defaults +* Add dependence on libnvidia-container-tools >= 1.3.1 -nvidia-container-toolkit (1.6.0~rc.1-1) experimental; urgency=medium +## v1.3.0 - * Add AARCH64 package for Amazon Linux 2 - * Include nvidia-container-runtime into nvidia-container-toolkit package +* Promote 1.3.0-rc.2-1 to 1.3.0 +* Add dependence on libnvidia-container-tools >= 1.3.0 - -- NVIDIA CORPORATION Mon, 06 Sep 2021 12:24:05 +0200 +## v1.3.0-rc.2 -nvidia-container-toolkit (1.5.1-1) UNRELEASED; urgency=medium +* 2c180947 Add more tests for new semantics with device list from volume mounts +* 7c003857 Refactor accepting device lists from volume mounts as a boolean - * Fix bug where Docker Swarm device selection is ignored if - NVIDIA_VISIBLE_DEVICES is also set - * Improve unit testing by using require package and adding coverage reports - * Remove unneeded go dependencies by running go mod tidy - * Move contents of pkg directory to cmd for CLI tools - * Ensure make binary target explicitly sets GOOS +## v1.3.0-rc.1 - -- NVIDIA CORPORATION Mon, 14 Jun 2021 09:00:00 -0700 +* b50d86c1 Update build system to accept a TAG variable for things like rc.x +* fe65573b Add common CI tests for things like golint, gofmt, unit tests, etc. +* da6fbb34 Revert "Add ability to merge envars of the form NVIDIA_VISIBLE_DEVICES_*" +* a7fb3330 Flip build-all targets to run automatically on merge requests +* 8b248b66 Rename github.com/NVIDIA/container-toolkit to nvidia-container-toolkit +* da36874e Add new config options to pull device list from mounted files instead of ENVVAR -nvidia-container-toolkit (1.5.0-1) UNRELEASED; urgency=medium +## v1.2.1 - * Add dependence on libnvidia-container-tools >= 1.4.0 - * Add golang check targets to Makefile - * Add Jenkinsfile definition for build targets - * Move docker.mk to docker folder +* 4e6e0ed4 Add 'ngx' to list of*all* driver capabilities +* 2f4af743 List config.toml as a config file in the RPM SPEC - -- NVIDIA CORPORATION Thu, 29 Apr 2021 03:12:43 -0700 +## v1.2.0 -nvidia-container-toolkit (1.4.2-1) UNRELEASED; urgency=medium +* 8e0aab46 Fix repo listed in changelog for debian distributions +* 320bb6e4 Update dependence on libnvidia-container to 1.2.0 +* 6cfc8097 Update package license to match source license +* e7dc3cbb Fix debian copyright file +* d3aee3e0 Add the 'ngx' driver capability - * Add dependence on libnvidia-container-tools >= 1.3.3 +## v1.1.2 - -- NVIDIA CORPORATION Fri, 05 Feb 2021 02:24:36 -0700 +* c32237f3 Add support for parsing Linux Capabilities for older OCI specs -nvidia-container-toolkit (1.4.1-1) UNRELEASED; urgency=medium +## v1.1.1 - * Ignore NVIDIA_VISIBLE_DEVICES for containers with insufficent privileges - * Add dependence on libnvidia-container-tools >= 1.3.2 +* d202aded Update dependence to libnvidia-container 1.1.1 - -- NVIDIA CORPORATION Mon, 25 Jan 2021 02:18:04 -0700 +## v1.1.0 -nvidia-container-toolkit (1.4.0-1) UNRELEASED; urgency=medium +* 4e4de762 Update build system to support multi-arch builds +* fcc1d116 Add support for MIG (Multi-Instance GPUs) +* d4ff0416 Add ability to merge envars of the form NVIDIA_VISIBLE_DEVICES_* +* 60f165ad Add no-pivot option to toolkit - * Add 'compute' capability to list of defaults - * Add dependence on libnvidia-container-tools >= 1.3.1 +## v1.0.5 - -- NVIDIA CORPORATION Fri, 11 Dec 2020 18:29:23 -0700 - -nvidia-container-toolkit (1.3.0-1) UNRELEASED; urgency=medium - - * Promote 1.3.0~rc.2-1 to 1.3.0-1 - * Add dependence on libnvidia-container-tools >= 1.3.0 - - -- NVIDIA CORPORATION Wed, 16 Sep 2020 13:40:29 -0700 - -nvidia-container-toolkit (1.3.0~rc.2-1) experimental; urgency=medium - - * 2c180947 Add more tests for new semantics with device list from volume mounts - * 7c003857 Refactor accepting device lists from volume mounts as a boolean - - -- NVIDIA CORPORATION Mon, 10 Aug 2020 15:05:34 -0700 - -nvidia-container-toolkit (1.3.0~rc.1-1) experimental; urgency=medium - - * b50d86c1 Update build system to accept a TAG variable for things like rc.x - * fe65573b Add common CI tests for things like golint, gofmt, unit tests, etc. - * da6fbb34 Revert "Add ability to merge envars of the form NVIDIA_VISIBLE_DEVICES_*" - * a7fb3330 Flip build-all targets to run automatically on merge requests - * 8b248b66 Rename github.com/NVIDIA/container-toolkit to nvidia-container-toolkit - * da36874e Add new config options to pull device list from mounted files instead of ENVVAR - - -- NVIDIA CORPORATION Fri, 24 Jul 2020 22:21:49 -0700 - -nvidia-container-toolkit (1.2.1-1) UNRELEASED; urgency=medium - - * 4e6e0ed4 Add 'ngx' to list of *all* driver capabilities - * 2f4af743 List config.toml as a config file in the RPM SPEC - - -- NVIDIA CORPORATION Wed, 22 Jul 2020 15:36:12 -0700 - -nvidia-container-toolkit (1.2.0-1) UNRELEASED; urgency=medium - - * 8e0aab46 Fix repo listed in changelog for debian distributions - * 320bb6e4 Update dependence on libnvidia-container to 1.2.0 - * 6cfc8097 Update package license to match source license - * e7dc3cbb Fix debian copyright file - * d3aee3e0 Add the 'ngx' driver capability - - -- NVIDIA CORPORATION Wed, 08 Jul 2020 18:11:19 -0700 - -nvidia-container-toolkit (1.1.2-1) UNRELEASED; urgency=medium - - * c32237f3 Add support for parsing Linux Capabilities for older OCI specs - - -- NVIDIA CORPORATION Wed, 03 Jun 2020 12:05:32 -0700 - -nvidia-container-toolkit (1.1.1-1) UNRELEASED; urgency=medium - - * d202aded Update dependence to libnvidia-container 1.1.1 - - -- NVIDIA CORPORATION Tue, 19 May 2020 12:05:32 -0700 - -nvidia-container-toolkit (1.1.0-1) UNRELEASED; urgency=medium - - * 4e4de762 Update build system to support multi-arch builds - * fcc1d116 Add support for MIG (Multi-Instance GPUs) - * d4ff0416 Add ability to merge envars of the form NVIDIA_VISIBLE_DEVICES_* - * 60f165ad Add no-pivot option to toolkit - - -- NVIDIA CORPORATION Fri, 15 May 2020 12:05:32 -0700 - -nvidia-container-toolkit (1.0.5-1) UNRELEASED; urgency=medium - - * Initial release. Replaces older package nvidia-container-runtime-hook. (Closes: #XXXXXX) - - -- Rajat Chopra Wed, 10 Jul 2019 11:31:11 -0700 +* Initial release. Replaces older package nvidia-container-runtime-hook. (Closes: #XXXXXX) From 033b2fd90d8eac56ece94582a9f61373e9f8cb2c Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 18 May 2022 13:54:46 +0200 Subject: [PATCH 3/5] Add dummy entry for rpm changelog matching other components Signed-off-by: Evan Lezar --- .../rpm/SPECS/nvidia-container-toolkit.spec | 137 +----------------- 1 file changed, 4 insertions(+), 133 deletions(-) diff --git a/packaging/rpm/SPECS/nvidia-container-toolkit.spec b/packaging/rpm/SPECS/nvidia-container-toolkit.spec index 96346a3a..d5a1b4f2 100644 --- a/packaging/rpm/SPECS/nvidia-container-toolkit.spec +++ b/packaging/rpm/SPECS/nvidia-container-toolkit.spec @@ -67,136 +67,7 @@ rm -f %{_bindir}/nvidia-container-runtime-hook /usr/share/containers/oci/hooks.d/oci-nvidia-hook.json %changelog -* Tue May 17 2022 NVIDIA CORPORATION 1.10.0-0.1.rc.3 -- [libnvida-container] Fix bug introduced when adding libcudadebugger.so to list of libraries - -* Fri May 13 2022 NVIDIA CORPORATION 1.10.0-0.1.rc.2 -- Add support for NVIDIA_REQUIRE_* checks for cuda version and arch to csv mode -- Switch to debug logging to reduce log verbosity -- Support logging to logs requested in command line -- Fix bug when launching containers with relative root path (e.g. using containerd) -- Allow low-level runtime path to be set explicitly as nvidia-container-runtime.runtimes option -- Fix failure to locate low-level runtime if PATH envvar is unset -- Replace experimental option for NVIDIA Container Runtime with nvidia-container-runtime.mode = csv option -- Use csv as default mode on Tegra systems without NVML -- Add --version flag to all CLIs -- [libnvidia-container] Bump libtirpc to 1.3.2 -- [libnvidia-container] Fix bug when running host ldconfig using glibc compiled with a non-standard prefix -- [libnvidia-container] Add libcudadebugger.so to list of compute libraries - -* Thu Mar 24 2022 NVIDIA CORPORATION 1.10.0-0.1.rc.1 -- Include nvidia-ctk CLI in installed binaries -- Add experimental option to NVIDIA Container Runtime - -* Fri Mar 18 2022 NVIDIA CORPORATION 1.9.0-1 -- [libnvidia-container] Add additional check for Tegra in /sys/.../family file in CLI -- [libnvidia-container] Update jetpack-specific CLI option to only load Base CSV files by default -- [libnvidia-container] Fix bug (from 1.8.0) when mounting GSP firmware into containers without /lib to /usr/lib symlinks -- [libnvidia-container] Update nvml.h to CUDA 11.6.1 nvML_DEV 11.6.55 -- [libnvidia-container] Update switch statement to include new brands from latest nvml.h -- [libnvidia-container] Process all --require flags on Jetson platforms -- [libnvidia-container] Fix long-standing issue with running ldconfig on Debian systems - -* Mon Feb 14 2022 NVIDIA CORPORATION 1.8.1-1 -- [libnvidia-container] Fix bug in determining cgroup root when running in nested containers -- [libnvidia-container] Fix permission issue when determining cgroup version - -* Fri Feb 04 2022 NVIDIA CORPORATION 1.8.0-1 -- Promote 1.8.0-0.1.rc.2 to 1.8.0-1 - -* Thu Jan 20 2022 NVIDIA CORPORATION 1.8.0-0.1.rc.2 -- Remove support for building amazonlinux1 packages - -* Wed Dec 08 2021 NVIDIA CORPORATION 1.8.0-0.1.rc.1 -- [libnvidia-container] Add support for cgroupv2 -- Release toolkit-container images from nvidia-container-toolkit repository - -* Tue Nov 30 2021 NVIDIA CORPORATION 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 1.7.0-0.1.rc.1 -- Specify containerd runtime type as string in config tools to remove dependency on containerd package -- Add supported-driver-capabilities config option to allow for a subset of all driver capabilities to be specified - -* Wed Nov 17 2021 NVIDIA CORPORATION 1.6.0-1 -- Promote 1.6.0-0.1.rc.3 to 1.6.0-1 -- Fix unnecessary logging to stderr instead of configured nvidia-container-runtime log file - -* Mon Nov 15 2021 NVIDIA CORPORATION 1.6.0-0.1.rc.3 - -- Add supported-driver-capabilities config option to the nvidia-container-toolkit -- Move OCI and command line checks for runtime to internal oci package - -* Fri Nov 05 2021 NVIDIA CORPORATION 1.6.0-0.1.rc.2 - -- Use relative path to OCI specification file (config.json) if bundle path is not specified as an argument to the nvidia-container-runtime - -* Mon Sep 06 2021 NVIDIA CORPORATION 1.6.0-0.1.rc.1 - -- Add AARCH64 package for Amazon Linux 2 -- Include nvidia-container-runtime into nvidia-container-toolkit package - -* Mon Jun 14 2021 NVIDIA CORPORATION 1.5.1-1 - -- Fix bug where Docker Swarm device selection is ignored if NVIDIA_VISIBLE_DEVICES is also set -- Improve unit testing by using require package and adding coverage reports -- Remove unneeded go dependencies by running go mod tidy -- Move contents of pkg directory to cmd for CLI tools -- Ensure make binary target explicitly sets GOOS - -* Thu Apr 29 2021 NVIDIA CORPORATION 1.5.0-1 -- Add dependence on libnvidia-container-tools >= 1.4.0 -- Add golang check targets to Makefile -- Add Jenkinsfile definition for build targets -- Move docker.mk to docker folder - -* Fri Feb 05 2021 NVIDIA CORPORATION 1.4.2-1 -- Add dependence on libnvidia-container-tools >= 1.3.3 - -* Mon Jan 25 2021 NVIDIA CORPORATION 1.4.1-1 -- Ignore NVIDIA_VISIBLE_DEVICES for containers with insufficent privileges -- Add dependence on libnvidia-container-tools >= 1.3.2 - -* Fri Dec 11 2020 NVIDIA CORPORATION 1.4.0-1 -- Add 'compute' capability to list of defaults -- Add dependence on libnvidia-container-tools >= 1.3.1 - -* Wed Sep 16 2020 NVIDIA CORPORATION 1.3.0-1 -- Promote 1.3.0-0.1.rc.2 to 1.3.0-1 -- Add dependence on libnvidia-container-tools >= 1.3.0 - -* Mon Aug 10 2020 NVIDIA CORPORATION 1.3.0-0.1.rc.2 -- 2c180947 Add more tests for new semantics with device list from volume mounts -- 7c003857 Refactor accepting device lists from volume mounts as a boolean - -* Fri Jul 24 2020 NVIDIA CORPORATION 1.3.0-0.1.rc.1 -- b50d86c1 Update build system to accept a TAG variable for things like rc.x -- fe65573b Add common CI tests for things like golint, gofmt, unit tests, etc. -- da6fbb34 Revert "Add ability to merge envars of the form NVIDIA_VISIBLE_DEVICES_*" -- a7fb3330 Flip build-all targets to run automatically on merge requests -- 8b248b66 Rename github.com/NVIDIA/container-toolkit to nvidia-container-toolkit -- da36874e Add new config options to pull device list from mounted files instead of ENVVAR - -* Wed Jul 22 2020 NVIDIA CORPORATION 1.2.1-1 -- 4e6e0ed4 Add 'ngx' to list of *all* driver capabilities -- 2f4af743 List config.toml as a config file in the RPM SPEC - -* Wed Jul 08 2020 NVIDIA CORPORATION 1.2.0-1 -- 8e0aab46 Fix repo listed in changelog for debian distributions -- 320bb6e4 Update dependence on libnvidia-container to 1.2.0 -- 6cfc8097 Update package license to match source license -- e7dc3cbb Fix debian copyright file -- d3aee3e0 Add the 'ngx' driver capability - -* Wed Jun 03 2020 NVIDIA CORPORATION 1.1.2-1 -- c32237f3 Add support for parsing Linux Capabilities for older OCI specs - -* Tue May 19 2020 NVIDIA CORPORATION 1.1.1-1 -- d202aded Update dependence to libnvidia-container 1.1.1 - -* Fri May 15 2020 NVIDIA CORPORATION 1.1.0-1 -- 4e4de762 Update build system to support multi-arch builds -- fcc1d116 Add support for MIG (Multi-Instance GPUs) -- d4ff0416 Add ability to merge envars of the form NVIDIA_VISIBLE_DEVICES_* -- 60f165ad Add no-pivot option to toolkit +# As of 1.10.0-1 we generate the release information automatically +* %{release_date} NVIDIA CORPORATION %{version}-%{release} +- See https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/main/CHANGELOG.md +- Bump libnvidia-container dependency to libnvidia-container-tools >= %{libnvidia_container_version} From e5125515f00c39993750ad621dcc262de248cd25 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 18 May 2022 13:55:05 +0200 Subject: [PATCH 4/5] Automatically generate changelogs in docker builds Signed-off-by: Evan Lezar --- docker/Dockerfile.amazonlinux | 2 ++ docker/Dockerfile.centos | 2 ++ docker/Dockerfile.debian | 9 ++++++--- docker/Dockerfile.opensuse-leap | 2 ++ docker/Dockerfile.ubuntu | 9 ++++++--- docker/docker.mk | 1 + 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile.amazonlinux b/docker/Dockerfile.amazonlinux index 77296029..01f738cd 100644 --- a/docker/Dockerfile.amazonlinux +++ b/docker/Dockerfile.amazonlinux @@ -27,6 +27,7 @@ ENV GOPATH /go ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH # packaging +ARG PKG_NAME ARG PKG_VERS ARG PKG_REV @@ -63,6 +64,7 @@ COPY packaging/rpm . CMD arch=$(uname -m) && \ rpmbuild --clean --target=$arch -bb \ -D "_topdir $PWD" \ + -D "release_date $(date +'%a %b %d %Y')" \ -D "version $VERSION" \ -D "libnvidia_container_version ${VERSION}-${RELEASE}" \ -D "release $RELEASE" \ diff --git a/docker/Dockerfile.centos b/docker/Dockerfile.centos index abbec683..3cf6b5ec 100644 --- a/docker/Dockerfile.centos +++ b/docker/Dockerfile.centos @@ -27,6 +27,7 @@ ENV GOPATH /go ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH # packaging +ARG PKG_NAME ARG PKG_VERS ARG PKG_REV @@ -61,6 +62,7 @@ COPY packaging/rpm . CMD arch=$(uname -m) && \ rpmbuild --clean --target=$arch -bb \ -D "_topdir $PWD" \ + -D "release_date $(date +'%a %b %d %Y')" \ -D "version $VERSION" \ -D "libnvidia_container_version ${VERSION}-${RELEASE}" \ -D "release $RELEASE" \ diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian index 3dcd9627..e0d64ec6 100644 --- a/docker/Dockerfile.debian +++ b/docker/Dockerfile.debian @@ -32,6 +32,7 @@ ENV GOPATH /go ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH # packaging +ARG PKG_NAME ARG PKG_VERS ARG PKG_REV @@ -64,9 +65,11 @@ RUN if [ "$(lsb_release -cs)" = "jessie" ]; then \ WORKDIR $DIST_DIR COPY packaging/debian ./debian -RUN sed -i "s;@VERSION@;${REVISION};" debian/changelog && \ - dch --changelog debian/changelog --append "Bump libnvidia-container dependency to ${REVISION}}" && \ - dch --changelog debian/changelog -r "" && \ +RUN dch --create --package="${PKG_NAME}" \ + --newversion "${REVISION}" \ + "See https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/main/CHANGELOG.md for the changelog" && \ + dch --append "Bump libnvidia-container dependency to ${REVISION}" && \ + dch -r "" && \ if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then exit 1; fi CMD export DISTRIB="$(lsb_release -cs)" && \ diff --git a/docker/Dockerfile.opensuse-leap b/docker/Dockerfile.opensuse-leap index fd02f4d5..11386628 100644 --- a/docker/Dockerfile.opensuse-leap +++ b/docker/Dockerfile.opensuse-leap @@ -25,6 +25,7 @@ ENV GOPATH /go ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH # packaging +ARG PKG_NAME ARG PKG_VERS ARG PKG_REV @@ -59,6 +60,7 @@ COPY packaging/rpm . CMD arch=$(uname -m) && \ rpmbuild --clean --target=$arch -bb \ -D "_topdir $PWD" \ + -D "release_date $(date +'%a %b %d %Y')" \ -D "version $VERSION" \ -D "libnvidia_container_version ${VERSION}-${RELEASE}" \ -D "release $RELEASE" \ diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index 7a5e39b2..a5e152f0 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -30,6 +30,7 @@ ENV GOPATH /go ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH # packaging +ARG PKG_NAME ARG PKG_VERS ARG PKG_REV @@ -57,9 +58,11 @@ COPY config/config.toml.${CONFIG_TOML_SUFFIX} $DIST_DIR/config.toml WORKDIR $DIST_DIR COPY packaging/debian ./debian -RUN sed -i "s;@VERSION@;${REVISION};" debian/changelog && \ - dch --changelog debian/changelog --append "Bump libnvidia-container dependency to ${REVISION}}" && \ - dch --changelog debian/changelog -r "" && \ +RUN dch --create --package="${PKG_NAME}" \ + --newversion "${REVISION}" \ + "See https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/main/CHANGELOG.md for the changelog" && \ + dch --append "Bump libnvidia-container dependency to ${REVISION}" && \ + dch -r "" && \ if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then exit 1; fi CMD export DISTRIB="$(lsb_release -cs)" && \ diff --git a/docker/docker.mk b/docker/docker.mk index 614b97bc..a22a504c 100644 --- a/docker/docker.mk +++ b/docker/docker.mk @@ -128,6 +128,7 @@ docker-build-%: --progress=plain \ --build-arg BASEIMAGE="$(BASEIMAGE)" \ --build-arg GOLANG_VERSION="$(GOLANG_VERSION)" \ + --build-arg PKG_NAME="$(LIB_NAME)" \ --build-arg PKG_VERS="$(LIB_VERSION)" \ --build-arg PKG_REV="$(PKG_REV)" \ --build-arg CONFIG_TOML_SUFFIX="$(CONFIG_TOML_SUFFIX)" \ From bb697271482cb9393109d5982dfe1816b15f49ea Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 18 May 2022 15:16:32 +0200 Subject: [PATCH 5/5] Include git commit in changelog URL Signed-off-by: Evan Lezar --- docker/Dockerfile.amazonlinux | 1 + docker/Dockerfile.centos | 1 + docker/Dockerfile.debian | 2 +- docker/Dockerfile.opensuse-leap | 1 + docker/Dockerfile.ubuntu | 2 +- packaging/rpm/SPECS/nvidia-container-toolkit.spec | 2 +- 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.amazonlinux b/docker/Dockerfile.amazonlinux index 01f738cd..cd1e2c86 100644 --- a/docker/Dockerfile.amazonlinux +++ b/docker/Dockerfile.amazonlinux @@ -65,6 +65,7 @@ CMD arch=$(uname -m) && \ rpmbuild --clean --target=$arch -bb \ -D "_topdir $PWD" \ -D "release_date $(date +'%a %b %d %Y')" \ + -D "git_commit ${GIT_COMMIT}" \ -D "version $VERSION" \ -D "libnvidia_container_version ${VERSION}-${RELEASE}" \ -D "release $RELEASE" \ diff --git a/docker/Dockerfile.centos b/docker/Dockerfile.centos index 3cf6b5ec..0c8befe2 100644 --- a/docker/Dockerfile.centos +++ b/docker/Dockerfile.centos @@ -63,6 +63,7 @@ CMD arch=$(uname -m) && \ rpmbuild --clean --target=$arch -bb \ -D "_topdir $PWD" \ -D "release_date $(date +'%a %b %d %Y')" \ + -D "git_commit ${GIT_COMMIT}" \ -D "version $VERSION" \ -D "libnvidia_container_version ${VERSION}-${RELEASE}" \ -D "release $RELEASE" \ diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian index e0d64ec6..2fbbda2d 100644 --- a/docker/Dockerfile.debian +++ b/docker/Dockerfile.debian @@ -67,7 +67,7 @@ COPY packaging/debian ./debian RUN dch --create --package="${PKG_NAME}" \ --newversion "${REVISION}" \ - "See https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/main/CHANGELOG.md for the changelog" && \ + "See https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/${GIT_COMMIT}/CHANGELOG.md for the changelog" && \ dch --append "Bump libnvidia-container dependency to ${REVISION}" && \ dch -r "" && \ if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then exit 1; fi diff --git a/docker/Dockerfile.opensuse-leap b/docker/Dockerfile.opensuse-leap index 11386628..d00a9714 100644 --- a/docker/Dockerfile.opensuse-leap +++ b/docker/Dockerfile.opensuse-leap @@ -61,6 +61,7 @@ CMD arch=$(uname -m) && \ rpmbuild --clean --target=$arch -bb \ -D "_topdir $PWD" \ -D "release_date $(date +'%a %b %d %Y')" \ + -D "git_commit ${GIT_COMMIT}" \ -D "version $VERSION" \ -D "libnvidia_container_version ${VERSION}-${RELEASE}" \ -D "release $RELEASE" \ diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index a5e152f0..53845d2c 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -60,7 +60,7 @@ COPY packaging/debian ./debian RUN dch --create --package="${PKG_NAME}" \ --newversion "${REVISION}" \ - "See https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/main/CHANGELOG.md for the changelog" && \ + "See https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/${GIT_COMMIT}/CHANGELOG.md for the changelog" && \ dch --append "Bump libnvidia-container dependency to ${REVISION}" && \ dch -r "" && \ if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then exit 1; fi diff --git a/packaging/rpm/SPECS/nvidia-container-toolkit.spec b/packaging/rpm/SPECS/nvidia-container-toolkit.spec index d5a1b4f2..e2f68fb1 100644 --- a/packaging/rpm/SPECS/nvidia-container-toolkit.spec +++ b/packaging/rpm/SPECS/nvidia-container-toolkit.spec @@ -69,5 +69,5 @@ rm -f %{_bindir}/nvidia-container-runtime-hook %changelog # As of 1.10.0-1 we generate the release information automatically * %{release_date} NVIDIA CORPORATION %{version}-%{release} -- See https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/main/CHANGELOG.md +- See https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/%{git_commit}/CHANGELOG.md - Bump libnvidia-container dependency to libnvidia-container-tools >= %{libnvidia_container_version}