UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2024-11-22 00:08:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'centos8-stream' into 'master'

Browse Source 
Switch to CentOS Stream 8 to build centos8 packages

See merge request nvidia/container-toolkit/container-toolkit!122
This commit is contained in:
Evan Lezar 2022-03-29 09:03:48 +00:00
commit 3479e353c5
8 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/Dockerfile.centos
View File

@ -1,15 +1,6 @@
ARG BASEIMAGE ARG BASEIMAGE
FROM ${BASEIMAGE} FROM ${BASEIMAGE}
ARG BASEIMAGE
# See https://www.centos.org/centos-linux-eol/
# and https://stackoverflow.com/a/70930049 for move to vault.centos.org
# and https://serverfault.com/questions/1093922/failing-to-run-yum-update-in-centos-8 for move to vault.epel.cloud
RUN [[ "${BASEIMAGE}" != "centos:8" ]] || \
( \
sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Linux-* && \
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.epel.cloud|g' /etc/yum.repos.d/CentOS-Linux-* \
)
RUN yum install -y \ RUN yum install -y \
ca-certificates \ ca-certificates \
wget \ wget \

2
docker/docker.mk
View File

@ -98,6 +98,7 @@ docker-all: $(AMD64_TARGETS) $(X86_64_TARGETS) \
# private centos target # private centos target
--centos%: OS := centos --centos%: OS := centos
--centos%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1) --centos%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1)
--centos8%: BASEIMAGE = quay.io/centos/centos:stream8
# private amazonlinux target # private amazonlinux target
--amazonlinux%: OS := amazonlinux --amazonlinux%: OS := amazonlinux
@ -113,6 +114,7 @@ docker-all: $(AMD64_TARGETS) $(X86_64_TARGETS) \
--rhel%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1) --rhel%: PKG_REV := $(if $(LIB_TAG),0.1.$(LIB_TAG),1)
--rhel%: VERSION = $(patsubst rhel%-$(ARCH),%,$(TARGET_PLATFORM)) --rhel%: VERSION = $(patsubst rhel%-$(ARCH),%,$(TARGET_PLATFORM))
--rhel%: ARTIFACTS_DIR = $(DIST_DIR)/rhel$(VERSION)/$(ARCH) --rhel%: ARTIFACTS_DIR = $(DIST_DIR)/rhel$(VERSION)/$(ARCH)
--rhel8%: BASEIMAGE = quay.io/centos/centos:stream8
# We allow the CONFIG_TOML_SUFFIX to be overridden. # We allow the CONFIG_TOML_SUFFIX to be overridden.
CONFIG_TOML_SUFFIX ?= $(OS) CONFIG_TOML_SUFFIX ?= $(OS)

6
packaging/debian/changelog
View File

@ -1,3 +1,9 @@
nvidia-container-toolkit (1.10.0~rc.1-1) experimental; urgency=medium
* Dummy entry
-- NVIDIA CORPORATION <cudatools@nvidia.com> Thu, 24 Mar 2022 13:22:24 +0200
nvidia-container-toolkit (1.9.0-1) UNRELEASED; urgency=medium nvidia-container-toolkit (1.9.0-1) UNRELEASED; urgency=medium
* [libnvidia-container] Add additional check for Tegra in /sys/.../family file in CLI * [libnvidia-container] Add additional check for Tegra in /sys/.../family file in CLI

3
packaging/rpm/SPECS/nvidia-container-toolkit.spec
View File

@ -64,6 +64,9 @@ rm -f %{_bindir}/nvidia-container-runtime-hook
/usr/share/containers/oci/hooks.d/oci-nvidia-hook.json /usr/share/containers/oci/hooks.d/oci-nvidia-hook.json
%changelog %changelog
* Thu Mar 24 2022 NVIDIA CORPORATION <cudatools@nvidia.com> 1.10.0-0.1.rc.1
- Dummy entry
* Fri Mar 18 2022 NVIDIA CORPORATION <cudatools@nvidia.com> 1.9.0-1 * Fri Mar 18 2022 NVIDIA CORPORATION <cudatools@nvidia.com> 1.9.0-1
- [libnvidia-container] Add additional check for Tegra in /sys/.../family file in CLI - [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] Update jetpack-specific CLI option to only load Base CSV files by default

2
third_party/libnvidia-container vendored

@ -1 +1 @@
Subproject commit 5e135c17d6dbae861ec343e9a8d3a0d2af758a4f Subproject commit a9aa8238398d2c1706bd0dbfca48f7690b5e0e70

2
third_party/nvidia-container-runtime vendored

@ -1 +1 @@
Subproject commit cb2278e9d320034c05b949ba8c784f8e4e81d7c9 Subproject commit c3d7d114d507e9b7ebfe9fc387a152be6ccaeea9

2
third_party/nvidia-docker vendored

@ -1 +1 @@
Subproject commit 4175b0fc355348dc85415bccef80684f42b20662 Subproject commit 7a02fe9453778ee09fa05c1af2a7372b1b4af608

6
versions.mk
View File

@ -13,13 +13,13 @@
# limitations under the License. # limitations under the License.
LIB_NAME := nvidia-container-toolkit LIB_NAME := nvidia-container-toolkit
LIB_VERSION := 1.9.0 LIB_VERSION := 1.10.0
LIB_TAG := LIB_TAG := rc.1
# Specify the nvidia-docker2 and nvidia-container-runtime package versions. # Specify the nvidia-docker2 and nvidia-container-runtime package versions.
# Note: The tag is automatically specified to match LIB_TAG. # Note: The tag is automatically specified to match LIB_TAG.
NVIDIA_DOCKER_VERSION := 2.10.0 NVIDIA_DOCKER_VERSION := 2.10.0
NVIDIA_CONTAINER_RUNTIME_VERSION := 3.9.0 NVIDIA_CONTAINER_RUNTIME_VERSION := 3.10.0
# Specify the expected libnvidia-container0 version for arm64-based ubuntu builds. # Specify the expected libnvidia-container0 version for arm64-based ubuntu builds.
LIBNVIDIA_CONTAINER0_VERSION := 0.10.0+jetpack LIBNVIDIA_CONTAINER0_VERSION := 0.10.0+jetpack