diff --git a/Makefile b/Makefile index a1dbfbe..d329b7d 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,9 @@ LIB_NAME := nvidia-docker2 LIB_VERSION := 2.6.1 LIB_TAG := rc.1 -TOOLKIT_VERSION := 1.5.2 +# Note: This should be the previous full release of nvidia-container-toolkit to ensure +# that release candidate (e.g. rc.1) work as expected. +TOOLKIT_VERSION := 1.5.1 # Supported OSs by architecture AMD64_TARGETS := ubuntu20.04 ubuntu18.04 ubuntu16.04 debian10 debian9 diff --git a/debian/control b/debian/control index ee8d0c4..caa03a1 100644 --- a/debian/control +++ b/debian/control @@ -12,6 +12,6 @@ Package: nvidia-docker2 Architecture: all Breaks: nvidia-docker (<< 2.0.0) Replaces: nvidia-docker (<< 2.0.0) -Depends: ${misc:Depends}, nvidia-container-toolkit (>= @TOOLKIT_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 the NVIDIA Container Toolkit diff --git a/docker/Dockerfile.amazonlinux b/docker/Dockerfile.amazonlinux index b6f8a6d..1970575 100644 --- a/docker/Dockerfile.amazonlinux +++ b/docker/Dockerfile.amazonlinux @@ -18,7 +18,7 @@ ENV DOCKER_VERSION $DOCKER_VERSION ENV TOOLKIT_VERSION $TOOLKIT_VERSION # output directory -ENV DIST_DIR=/tmp/nvidia-container-runtime-$PKG_VERS/SOURCES +ENV DIST_DIR=/tmp/nvidia-docker2-$PKG_VERS/SOURCES RUN mkdir -p $DIST_DIR /dist COPY nvidia-docker $DIST_DIR diff --git a/docker/Dockerfile.centos b/docker/Dockerfile.centos index b6f8a6d..1970575 100644 --- a/docker/Dockerfile.centos +++ b/docker/Dockerfile.centos @@ -18,7 +18,7 @@ ENV DOCKER_VERSION $DOCKER_VERSION ENV TOOLKIT_VERSION $TOOLKIT_VERSION # output directory -ENV DIST_DIR=/tmp/nvidia-container-runtime-$PKG_VERS/SOURCES +ENV DIST_DIR=/tmp/nvidia-docker2-$PKG_VERS/SOURCES RUN mkdir -p $DIST_DIR /dist COPY nvidia-docker $DIST_DIR diff --git a/docker/Dockerfile.opensuse-leap b/docker/Dockerfile.opensuse-leap index ccaeab9..3420ad4 100644 --- a/docker/Dockerfile.opensuse-leap +++ b/docker/Dockerfile.opensuse-leap @@ -18,7 +18,7 @@ ENV DOCKER_VERSION $DOCKER_VERSION ENV TOOLKIT_VERSION $TOOLKIT_VERSION # output directory -ENV DIST_DIR=/tmp/nvidia-container-runtime-$PKG_VERS/SOURCES +ENV DIST_DIR=/tmp/nvidia-docker2-$PKG_VERS/SOURCES RUN mkdir -p $DIST_DIR /dist COPY nvidia-docker $DIST_DIR diff --git a/rpm/SPECS/nvidia-docker2.spec b/rpm/SPECS/nvidia-docker2.spec index cf7feda..8085b45 100644 --- a/rpm/SPECS/nvidia-docker2.spec +++ b/rpm/SPECS/nvidia-docker2.spec @@ -16,7 +16,7 @@ Source1: daemon.json Source2: LICENSE Conflicts: nvidia-docker < 2.0.0 -Requires: nvidia-container-toolkit >= %{toolkit_version} +Requires: nvidia-container-toolkit > %{toolkit_version} Requires: %{docker_version} %description