Correct DIST_DIR in rpm build docker files
Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
parent
f4ba99f986
commit
8f94f91863
4
Makefile
4
Makefile
|
@ -8,7 +8,9 @@ LIB_NAME := nvidia-docker2
|
||||||
LIB_VERSION := 2.6.1
|
LIB_VERSION := 2.6.1
|
||||||
LIB_TAG := rc.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
|
# Supported OSs by architecture
|
||||||
AMD64_TARGETS := ubuntu20.04 ubuntu18.04 ubuntu16.04 debian10 debian9
|
AMD64_TARGETS := ubuntu20.04 ubuntu18.04 ubuntu16.04 debian10 debian9
|
||||||
|
|
2
debian/control
vendored
2
debian/control
vendored
|
@ -12,6 +12,6 @@ Package: nvidia-docker2
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Breaks: nvidia-docker (<< 2.0.0)
|
Breaks: nvidia-docker (<< 2.0.0)
|
||||||
Replaces: 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
|
Description: nvidia-docker CLI wrapper
|
||||||
Replaces nvidia-docker with a new implementation based on the NVIDIA Container Toolkit
|
Replaces nvidia-docker with a new implementation based on the NVIDIA Container Toolkit
|
||||||
|
|
|
@ -18,7 +18,7 @@ ENV DOCKER_VERSION $DOCKER_VERSION
|
||||||
ENV TOOLKIT_VERSION $TOOLKIT_VERSION
|
ENV TOOLKIT_VERSION $TOOLKIT_VERSION
|
||||||
|
|
||||||
# output directory
|
# 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
|
RUN mkdir -p $DIST_DIR /dist
|
||||||
|
|
||||||
COPY nvidia-docker $DIST_DIR
|
COPY nvidia-docker $DIST_DIR
|
||||||
|
|
|
@ -18,7 +18,7 @@ ENV DOCKER_VERSION $DOCKER_VERSION
|
||||||
ENV TOOLKIT_VERSION $TOOLKIT_VERSION
|
ENV TOOLKIT_VERSION $TOOLKIT_VERSION
|
||||||
|
|
||||||
# output directory
|
# 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
|
RUN mkdir -p $DIST_DIR /dist
|
||||||
|
|
||||||
COPY nvidia-docker $DIST_DIR
|
COPY nvidia-docker $DIST_DIR
|
||||||
|
|
|
@ -18,7 +18,7 @@ ENV DOCKER_VERSION $DOCKER_VERSION
|
||||||
ENV TOOLKIT_VERSION $TOOLKIT_VERSION
|
ENV TOOLKIT_VERSION $TOOLKIT_VERSION
|
||||||
|
|
||||||
# output directory
|
# 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
|
RUN mkdir -p $DIST_DIR /dist
|
||||||
|
|
||||||
COPY nvidia-docker $DIST_DIR
|
COPY nvidia-docker $DIST_DIR
|
||||||
|
|
|
@ -16,7 +16,7 @@ Source1: daemon.json
|
||||||
Source2: LICENSE
|
Source2: LICENSE
|
||||||
|
|
||||||
Conflicts: nvidia-docker < 2.0.0
|
Conflicts: nvidia-docker < 2.0.0
|
||||||
Requires: nvidia-container-toolkit >= %{toolkit_version}
|
Requires: nvidia-container-toolkit > %{toolkit_version}
|
||||||
Requires: %{docker_version}
|
Requires: %{docker_version}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
|
|
Loading…
Reference in a new issue