diff --git a/Makefile b/Makefile index 017b2e4..a1dbfbe 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ LIB_NAME := nvidia-docker2 LIB_VERSION := 2.6.1 LIB_TAG := rc.1 -RUNTIME_VERSION := 3.5.0 +TOOLKIT_VERSION := 1.5.2 # Supported OSs by architecture AMD64_TARGETS := ubuntu20.04 ubuntu18.04 ubuntu16.04 debian10 debian9 @@ -129,7 +129,7 @@ docker-build-%: --progress=plain \ --build-arg BASEIMAGE="$(BASEIMAGE)" \ --build-arg DOCKER_VERSION="$(DOCKER_VERSION)" \ - --build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)" \ + --build-arg TOOLKIT_VERSION="$(TOOLKIT_VERSION)" \ --build-arg PKG_VERS="$(LIB_VERSION)" \ --build-arg PKG_REV="$(PKG_REV)" \ --tag $(BUILDIMAGE) \ diff --git a/debian/changelog b/debian/changelog index b300e9a..4956ab7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ nvidia-docker2 (2.6.1~rc.1-1) UNRELEASED; urgency=medium * [BUILD] Allow for TAG to be specified in Makfile to match other projects + * Replace nvidia-container-runtime dependece with nvidia-container-toolit >= 1.5.2 + -- NVIDIA CORPORATION Thu, 29 Apr 2021 05:25:25 +0000 diff --git a/debian/control b/debian/control index 84bb44a..ee8d0c4 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,6 @@ Package: nvidia-docker2 Architecture: all Breaks: nvidia-docker (<< 2.0.0) Replaces: nvidia-docker (<< 2.0.0) -Depends: ${misc:Depends}, nvidia-container-runtime (>= @RUNTIME_VERSION@), @DOCKER_VERSION@ +Depends: ${misc:Depends}, nvidia-container-toolkit (>= @TOOLKIT_VERSION@), @DOCKER_VERSION@ Description: nvidia-docker CLI wrapper - Replaces nvidia-docker with a new implementation based on - nvidia-container-runtime + Replaces nvidia-docker with a new implementation based on the NVIDIA Container Toolkit diff --git a/debian/prepare b/debian/prepare index 5900ca5..04229c7 100755 --- a/debian/prepare +++ b/debian/prepare @@ -3,5 +3,5 @@ set -e sed -i "s;@SECTION@;${SECTION:+$SECTION/};g" debian/control -sed -i "s;@RUNTIME_VERSION@;${RUNTIME_VERSION};g" debian/control +sed -i "s;@TOOLKIT_VERSION@;${TOOLKIT_VERSION};g" debian/control sed -i "s;@DOCKER_VERSION@;${DOCKER_VERSION};g" debian/control diff --git a/docker/Dockerfile.amazonlinux b/docker/Dockerfile.amazonlinux index ade1a06..b6f8a6d 100644 --- a/docker/Dockerfile.amazonlinux +++ b/docker/Dockerfile.amazonlinux @@ -9,13 +9,13 @@ RUN yum install -y \ # packaging ARG PKG_VERS ARG PKG_REV -ARG RUNTIME_VERSION +ARG TOOLKIT_VERSION ARG DOCKER_VERSION ENV VERSION $PKG_VERS ENV RELEASE $PKG_REV ENV DOCKER_VERSION $DOCKER_VERSION -ENV RUNTIME_VERSION $RUNTIME_VERSION +ENV TOOLKIT_VERSION $TOOLKIT_VERSION # output directory ENV DIST_DIR=/tmp/nvidia-container-runtime-$PKG_VERS/SOURCES @@ -34,6 +34,6 @@ CMD rpmbuild --clean -bb \ -D "version $VERSION" \ -D "release $RELEASE" \ -D "docker_version $DOCKER_VERSION" \ - -D "runtime_version $RUNTIME_VERSION" \ + -D "toolkit_version $TOOLKIT_VERSION" \ SPECS/nvidia-docker2.spec && \ mv RPMS/noarch/*.rpm /dist diff --git a/docker/Dockerfile.centos b/docker/Dockerfile.centos index ade1a06..b6f8a6d 100644 --- a/docker/Dockerfile.centos +++ b/docker/Dockerfile.centos @@ -9,13 +9,13 @@ RUN yum install -y \ # packaging ARG PKG_VERS ARG PKG_REV -ARG RUNTIME_VERSION +ARG TOOLKIT_VERSION ARG DOCKER_VERSION ENV VERSION $PKG_VERS ENV RELEASE $PKG_REV ENV DOCKER_VERSION $DOCKER_VERSION -ENV RUNTIME_VERSION $RUNTIME_VERSION +ENV TOOLKIT_VERSION $TOOLKIT_VERSION # output directory ENV DIST_DIR=/tmp/nvidia-container-runtime-$PKG_VERS/SOURCES @@ -34,6 +34,6 @@ CMD rpmbuild --clean -bb \ -D "version $VERSION" \ -D "release $RELEASE" \ -D "docker_version $DOCKER_VERSION" \ - -D "runtime_version $RUNTIME_VERSION" \ + -D "toolkit_version $TOOLKIT_VERSION" \ SPECS/nvidia-docker2.spec && \ mv RPMS/noarch/*.rpm /dist diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian index aff1222..1bc7b61 100644 --- a/docker/Dockerfile.debian +++ b/docker/Dockerfile.debian @@ -13,14 +13,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # packaging ARG PKG_VERS ARG PKG_REV -ARG RUNTIME_VERSION +ARG TOOLKIT_VERSION ARG DOCKER_VERSION ENV DEBFULLNAME "NVIDIA CORPORATION" ENV DEBEMAIL "cudatools@nvidia.com" ENV REVISION "$PKG_VERS-$PKG_REV" ENV DOCKER_VERSION $DOCKER_VERSION -ENV RUNTIME_VERSION $RUNTIME_VERSION +ENV TOOLKIT_VERSION $TOOLKIT_VERSION ENV SECTION "" # output directory diff --git a/docker/Dockerfile.opensuse-leap b/docker/Dockerfile.opensuse-leap index ac52917..ccaeab9 100644 --- a/docker/Dockerfile.opensuse-leap +++ b/docker/Dockerfile.opensuse-leap @@ -9,13 +9,13 @@ RUN zypper install -y \ # packaging ARG PKG_VERS ARG PKG_REV -ARG RUNTIME_VERSION +ARG TOOLKIT_VERSION ARG DOCKER_VERSION ENV VERSION $PKG_VERS ENV RELEASE $PKG_REV ENV DOCKER_VERSION $DOCKER_VERSION -ENV RUNTIME_VERSION $RUNTIME_VERSION +ENV TOOLKIT_VERSION $TOOLKIT_VERSION # output directory ENV DIST_DIR=/tmp/nvidia-container-runtime-$PKG_VERS/SOURCES @@ -34,6 +34,6 @@ CMD rpmbuild --clean -bb \ -D "version $VERSION" \ -D "release $RELEASE" \ -D "docker_version $DOCKER_VERSION" \ - -D "runtime_version $RUNTIME_VERSION" \ + -D "toolkit_version $TOOLKIT_VERSION" \ SPECS/nvidia-docker2.spec && \ mv RPMS/noarch/*.rpm /dist diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index 431493b..8ecee60 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -14,14 +14,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # packaging ARG PKG_VERS ARG PKG_REV -ARG RUNTIME_VERSION +ARG TOOLKIT_VERSION ARG DOCKER_VERSION ENV DEBFULLNAME "NVIDIA CORPORATION" ENV DEBEMAIL "cudatools@nvidia.com" ENV REVISION "$PKG_VERS-$PKG_REV" ENV DOCKER_VERSION $DOCKER_VERSION -ENV RUNTIME_VERSION $RUNTIME_VERSION +ENV TOOLKIT_VERSION $TOOLKIT_VERSION ENV SECTION "" # output directory diff --git a/rpm/SPECS/nvidia-docker2.spec b/rpm/SPECS/nvidia-docker2.spec index 9d602c1..cf7feda 100644 --- a/rpm/SPECS/nvidia-docker2.spec +++ b/rpm/SPECS/nvidia-docker2.spec @@ -16,11 +16,11 @@ Source1: daemon.json Source2: LICENSE Conflicts: nvidia-docker < 2.0.0 -Requires: nvidia-container-runtime >= %{runtime_version} +Requires: nvidia-container-toolkit >= %{toolkit_version} Requires: %{docker_version} %description -Replaces nvidia-docker with a new implementation based on nvidia-container-runtime +Replaces nvidia-docker with a new implementation based on the NVIDIA Container Toolkit %prep cp %{SOURCE0} %{SOURCE1} %{SOURCE2} . @@ -39,6 +39,7 @@ install -m 644 -t %{buildroot}/etc/docker daemon.json %changelog * Mon Sep 06 2021 NVIDIA CORPORATION 2.6.1-0.1.rc.1 - [BUILD] Allow for TAG to be specified in Makfile to match other projects +- Replace nvidia-container-runtime dependece with nvidia-container-toolit >= 1.5.2 * Thu Apr 29 2021 NVIDIA CORPORATION 2.6.0-1 - Add dependence on nvidia-container-runtime >= 3.5.0