Depend on nvidia-container-toolkit instead of nvidia-container-runtime

Signed-off-by: Evan Lezar <elezar@nvidia.com>
2021-09-06 15:54:44 +02:00 · 2021-09-06 15:54:44 +02:00 · f4ba99f986
parent ef115045af
commit f4ba99f986
10 changed files with 23 additions and 21 deletions
--- a/4
+++ b/4
@ -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) \
--- 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 <cudatools@nvidia.com>  Thu, 29 Apr 2021 05:25:25 +0000

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 <cudatools@nvidia.com> 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 <cudatools@nvidia.com> 2.6.0-1
 - Add dependence on nvidia-container-runtime >= 3.5.0