From 132f8ddfa0faabdd218afe8a40a6fe5485a48ce7 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Fri, 17 Jun 2022 11:31:01 +0200 Subject: [PATCH 1/2] Rename master to main Signed-off-by: Evan Lezar --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 68f0734a..ed5c512c 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ # NVIDIA Container Toolkit -[![GitHub license](https://img.shields.io/github/license/NVIDIA/nvidia-docker?style=flat-square)](https://raw.githubusercontent.com/NVIDIA/nvidia-docker/master/LICENSE) +[![GitHub license](https://img.shields.io/github/license/NVIDIA/nvidia-docker?style=flat-square)](https://raw.githubusercontent.com/NVIDIA/nvidia-docker/main/LICENSE) [![Documentation](https://img.shields.io/badge/documentation-wiki-blue.svg?style=flat-square)](https://github.com/NVIDIA/nvidia-docker/wiki) [![Package repository](https://img.shields.io/badge/packages-repository-b956e8.svg?style=flat-square)](https://nvidia.github.io/nvidia-docker) ![nvidia-gpu-docker](https://cloud.githubusercontent.com/assets/3028125/12213714/5b208976-b632-11e5-8406-38d379ec46aa.png) ## Introduction -The NVIDIA Container Toolkit allows users to build and run GPU accelerated Docker containers. The toolkit includes a container runtime [library](https://github.com/NVIDIA/libnvidia-container) and utilities to automatically configure containers to leverage NVIDIA GPUs. +The NVIDIA Container Toolkit allows users to build and run GPU accelerated Docker containers. The toolkit includes a container runtime [library](https://github.com/NVIDIA/libnvidia-container) and utilities to automatically configure containers to leverage NVIDIA GPUs. -Product documentation including an architecture overview, platform support, installation and usage guides can be found in the [documentation repository](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/overview.html). +Product documentation including an architecture overview, platform support, installation and usage guides can be found in the [documentation repository](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/overview.html). Frequently asked questions are available on the [wiki](https://github.com/NVIDIA/nvidia-docker/wiki). @@ -18,11 +18,11 @@ Frequently asked questions are available on the [wiki](https://github.com/NVIDIA **Make sure you have installed the [NVIDIA driver](https://github.com/NVIDIA/nvidia-docker/wiki/Frequently-Asked-Questions#how-do-i-install-the-nvidia-driver) and Docker engine for your Linux distribution** **Note that you do not need to install the CUDA Toolkit on the host system, but the NVIDIA driver needs to be installed** -For instructions on getting started with the NVIDIA Container Toolkit, refer to the [installation guide](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/install-guide.html#docker). +For instructions on getting started with the NVIDIA Container Toolkit, refer to the [installation guide](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/install-guide.html#docker). ## Usage -The [user guide](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/user-guide.html) provides information on the configuration and command line options available when running GPU containers with Docker. +The [user guide](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/user-guide.html) provides information on the configuration and command line options available when running GPU containers with Docker. ## Issues and Contributing From cc7c7ae430e1610c28eddf5eb8b469eaf6cdcdf3 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Fri, 17 Jun 2022 11:53:32 +0200 Subject: [PATCH 2/2] Switch to latest docker and docker dind Signed-off-by: Evan Lezar --- .gitlab-ci.yml | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 253bcbf2..e377a849 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,24 @@ -# Build packages for all supported OS / ARCH combinations +# Copyright (c) 2020-2022, NVIDIA CORPORATION. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +default: + image: docker + services: + - name: docker:dind + command: ["--experimental"] +# Build packages for all supported OS / ARCH combinations stages: - build-one - build-all @@ -13,12 +32,6 @@ variables: TOOLKIT_TAG: dummy+toolkit .build-setup: &build-setup - image: docker:19.03.8 - - services: - - name: docker:19.03.8-dind - command: ["--experimental"] - before_script: - apk update - apk upgrade