Commit Graph

396 Commits

Author SHA1 Message Date
Evan Lezar 9de312f595 Merge branch 'fix-toolkit-rpm-dependencies' into 'master'
Fix minimum toolkit version in RPM spec

See merge request nvidia/container-toolkit/nvidia-docker!29
2021-11-05 14:02:58 +00:00
Evan Lezar 146eb62cf6 Fix minimum toolkit version in RPM spec
Signed-off-by: Evan Lezar <elezar@nvidia.com>
2021-11-05 15:00:43 +01:00
Evan Lezar b920bb4bfc Merge branch 'fix-toolkit-version-replacement' into 'master'
Use separate make variable for toolkit version

See merge request nvidia/container-toolkit/nvidia-docker!28
2021-11-05 13:52:22 +00:00
Evan Lezar 25ab048e4f Use separate make variable for toolkit version
Signed-off-by: Evan Lezar <elezar@nvidia.com>
2021-11-05 14:42:02 +01:00
Evan Lezar 9fca9bb435 Merge branch 'fix-toolkit-version-replacement' into 'master'
Fix TOOLKIT_VERSION replacement

See merge request nvidia/container-toolkit/nvidia-docker!27
2021-11-05 13:03:39 +00:00
Evan Lezar b45bca6e56 Fix TOOLKIT_VERSION replacement
Signed-off-by: Evan Lezar <elezar@nvidia.com>
2021-11-05 14:01:47 +01:00
Evan Lezar 1b78009668 Merge branch 'bump-version-2.7.0-rc.2' into 'master'
Bump version to 2.7.0-rc.2

See merge request nvidia/container-toolkit/nvidia-docker!26
2021-11-04 16:13:47 +00:00
Evan Lezar 38752d3494 Bump version to 2.7.0-rc.2
This also allows the TOOLKIT dependency to be specified as a make
variable requiring fewer changes when releasing this package from
the toolkit in future.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
2021-11-04 16:24:28 +01:00
Evan Lezar 4613cdae34 Merge branch 'al2-aarch64' into 'master'
Add aarch64 build for Amazon Linux 2

See merge request nvidia/container-toolkit/nvidia-docker!25
2021-10-19 13:26:58 +00:00
Evan Lezar c923fa9baf Merge branch 'set-version' into 'master'
Bump version to 2.7.0-rc.1

See merge request nvidia/container-toolkit/nvidia-docker!24
2021-10-19 13:26:06 +00:00
Evan Lezar ef811953d7 Correct typo in changelog
Signed-off-by: Evan Lezar <elezar@nvidia.com>
2021-10-18 12:26:18 +02:00
Evan Lezar c6895f8d18 Add aarch64 build for Amazon Linux 2
Signed-off-by: Evan Lezar <elezar@nvidia.com>
2021-10-18 11:54:23 +02:00
Evan Lezar 7f453642e7 Bump verison to 2.7.0-rc.1
Signed-off-by: Evan Lezar <elezar@nvidia.com>
2021-10-15 13:39:04 +02:00
Evan Lezar 0940c7f231 Move make logic to docker.mk to mirror other projects
Signed-off-by: Evan Lezar <elezar@nvidia.com>
2021-10-08 15:05:49 +02:00
Evan Lezar 52ed1032c8 Merge branch 'fix-rpm-build-revisions' into 'master'
Fix issues with package revision

See merge request nvidia/container-toolkit/nvidia-docker!23
2021-09-28 18:00:46 +00:00
Evan Lezar 1e579fadcd Correct nvidia-container-toolkit dependency
This change adds a package revision (3) to the nvidia-container-toolkit
dependency. This is to ensure that none of the released package versions
incorrectly meet the >> 1.5.1 requirement.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
2021-09-27 16:03:07 +02:00
Evan Lezar 842a3086de Use consisent package revisions for rpm packages
Using differing package revisions for different rpm targets makes
correctly defining packaging dependencies for other components of
the stack problematic. This change ensures that the same package
revision is used for all rpm targets.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
2021-09-23 19:54:34 +02:00
Evan Lezar 5a304331c0 Merge branch 'depend-on-nvidia-container-toolkit' into 'master'
Depend on nvidia-container-toolkit package instead of nvidia-container-runtime

See merge request nvidia/container-toolkit/nvidia-docker!21
2021-09-20 15:14:05 +00:00
Evan Lezar 8f94f91863 Correct DIST_DIR in rpm build docker files
Signed-off-by: Evan Lezar <elezar@nvidia.com>
2021-09-20 16:03:04 +02:00
Evan Lezar f4ba99f986 Depend on nvidia-container-toolkit instead of nvidia-container-runtime
Signed-off-by: Evan Lezar <elezar@nvidia.com>
2021-09-06 15:58:19 +02:00
Evan Lezar ef115045af Bump version for post 2.6.0 development
Signed-off-by: Evan Lezar <elezar@nvidia.com>
2021-09-06 15:52:13 +02:00
Evan Lezar ccf3e312a2 Merge branch 'fix-jenkinsfile' into 'master'
Remove reference to missing make file

See merge request nvidia/container-toolkit/nvidia-docker!20
2021-06-23 11:12:16 +00:00
Evan Lezar d1db4241dc [INTERNAL] Remove reference to missing make file
Signed-off-by: Evan Lezar <elezar@nvidia.com>
2021-06-23 11:39:29 +02:00
Evan Lezar 5ede9e621c Merge branch 'fix-jenkinsfile' into 'master'
Fix isTag in Jenkinsfile

See merge request nvidia/container-toolkit/nvidia-docker!19
2021-06-14 12:25:42 +00:00
Evan Lezar 54dfaf31c6 Fix isTag in Jenkinsfile
Signed-off-by: Evan Lezar <elezar@nvidia.com>
2021-06-14 13:48:28 +02:00
Evan Lezar 9a98d3ff1b Merge branch 'CNT-1334-publish-tags-to-artifactory' into 'master'
Add artifactory publish step

See merge request nvidia/container-toolkit/nvidia-docker!18
2021-05-18 19:06:13 +00:00
Evan Lezar e7b62e3292 Add artifactory publish step
This change simplifies the build process by only targetting ubuntu20.04-amd64
and adds logic to push tagged builds to artifactory.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
2021-05-18 11:35:59 +02:00
Kevin Klues 26efc6d42c Merge branch 'upstream-bump-v2.6.0' into 'master'
Bump version to 2.6.0

See merge request nvidia/container-toolkit/nvidia-docker!17
2021-04-29 14:01:50 +00:00
Kevin Klues a55df56621 Bump version to v2.6.0
Signed-off-by: Kevin Klues <kklues@nvidia.com>
2021-04-29 12:27:08 +00:00
Kevin Klues 2c068ea0c3 Update dependent nvidia-container-runtime version to 3.5.0
Signed-off-by: Kevin Klues <kklues@nvidia.com>
2021-04-29 12:24:16 +00:00
Evan Lezar b17795a6f1 Merge branch 'add-jenkins-ci' into 'master'
Add Jenkins pipeline definition

See merge request nvidia/container-toolkit/nvidia-docker!16
2021-03-24 12:02:34 +00:00
Evan Lezar 3ad571f6ca Add Jenkinsfile for building packages
Signed-off-by: Evan Lezar <elezar@nvidia.com>
2021-03-24 09:39:44 +01:00
Evan Lezar f2919b28e8 Quote all build args
Signed-off-by: Evan Lezar <elezar@nvidia.com>
2021-03-24 09:32:28 +01:00
Kevin Klues e2d0f02263 Merge branch 'upstream-bump-v2.5.0' into 'master'
Bump to version 2.5.0

See merge request nvidia/container-toolkit/nvidia-docker!15
2020-09-16 13:56:48 +00:00
Kevin Klues 869d27d8d3 Bump to version 2.5.0
Signed-off-by: Kevin Klues <kklues@nvidia.com>
2020-09-16 12:09:10 +00:00
Kevin Klues a4b6214173 Add %config directive to daemon.json for RPM installations
This prevents existing modifications to this file to be automatically
saved in a backup instead of overwritten.

Details here:
https://docs.fedoraproject.org/ro/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch09s05s03.html

Signed-off-by: Kevin Klues <kklues@nvidia.com>
2020-09-16 12:08:26 +00:00
Jon Mayo 11097a332a Merge branch 'dualvtable/nvidia-docker-Update-readme'
* dualvtable/nvidia-docker-Update-readme:
  Update readme to point to the official documentation
  Update changelogs for 2.4.0
  Bump version to 2.4.0
  Update dependence on nvidia-container-runtime to 3.3.0
2020-09-01 16:27:49 -07:00
Pramod Ramarao 88a2fda83c Update readme to point to the official documentation 2020-09-01 16:00:32 -07:00
Kevin Klues 6e38c3f979 Merge branch 'upstream-bump-v2.4.0' into 'master'
Bump to version 2.4.0

See merge request nvidia/container-toolkit/nvidia-docker!12
2020-07-08 20:35:26 +00:00
Kevin Klues bad43e8cbe Update changelogs for 2.4.0
Signed-off-by: Kevin Klues <kklues@nvidia.com>
2020-07-08 18:34:22 +00:00
Kevin Klues 5e7964ad8e Bump version to 2.4.0
Signed-off-by: Kevin Klues <kklues@nvidia.com>
2020-07-08 18:30:35 +00:00
Kevin Klues b9c701554e Update dependence on nvidia-container-runtime to 3.3.0
Signed-off-by: Kevin Klues <kklues@nvidia.com>
2020-07-08 18:29:46 +00:00
Renaud Gaubert 09a012761e Update package license to match source license
Signed-off-by: Renaud Gaubert <rgaubert@nvidia.com>
2020-06-10 21:32:07 +00:00
Kevin Klues e6e992a9c2 Update changelog for 2.3.0 release (typo in previous commit for version)
Signed-off-by: Kevin Klues <kklues@nvidia.com>
2020-05-18 13:40:27 +02:00
Renaud Gaubert 8557216d04 Bump to version 3.2.0
Signed-off-by: Renaud Gaubert <rgaubert@nvidia.com>
2020-05-15 19:48:37 +00:00
Renaud Gaubert 0d3b049a3c Merge branch 'upstream-cross-build' into 'master'
Update build system to match libnvidia-container (and friends)

See merge request nvidia/container-toolkit/nvidia-docker!11
2020-05-15 18:11:14 +00:00
Kevin Klues 0c77d3e9c1 Update .gitlab-ci.yml to match that of libnvidia-container
Signed-off-by: Kevin Klues <kklues@nvidia.com>
2020-05-14 21:33:28 +00:00
Kevin Klues f6f83459fd Update build system to match libnvidia-container
Signed-off-by: Kevin Klues <kklues@nvidia.com>
2020-05-14 21:32:55 +00:00
Renaud Gaubert 166fa7ffb2 Update README to reflect distribution support
Signed-off-by: Renaud Gaubert <rgaubert@nvidia.com>
2020-05-11 07:00:48 +00:00
Renaud Gaubert b44509f281 Fix Docker reference from 110.03 to 19.03
Signed-off-by: Renaud Gaubert <rgaubert@nvidia.com>
2020-02-26 00:10:06 -08:00