Update nvidia-docker to use new runtime

This commit is contained in:
Renaud Gaubert 2019-07-18 19:18:50 -07:00
parent cd0f1e335c
commit 1269921c5c
8 changed files with 62 additions and 548 deletions

View file

@ -9,12 +9,10 @@ RUN yum install -y \
# packaging
ARG PKG_VERS
ARG PKG_REV
ARG RUNTIME_VERSION
ARG DOCKER_VERSION
ENV VERSION $PKG_VERS
ENV RELEASE $PKG_REV
ENV RUNTIME_VERSION $RUNTIME_VERSION
ENV DOCKER_VERSION $DOCKER_VERSION
# output directory
@ -31,7 +29,6 @@ CMD rpmbuild --clean -bb \
-D "_topdir $PWD" \
-D "version $VERSION" \
-D "release $RELEASE" \
-D "runtime_version $RUNTIME_VERSION" \
-D "docker_version $DOCKER_VERSION" \
SPECS/nvidia-docker2.spec && \
mv RPMS/noarch/*.rpm /dist

View file

@ -9,12 +9,10 @@ RUN yum install -y \
# packaging
ARG PKG_VERS
ARG PKG_REV
ARG RUNTIME_VERSION
ARG DOCKER_VERSION
ENV VERSION $PKG_VERS
ENV RELEASE $PKG_REV
ENV RUNTIME_VERSION $RUNTIME_VERSION
ENV DOCKER_VERSION $DOCKER_VERSION
# output directory
@ -31,7 +29,6 @@ CMD rpmbuild --clean -bb \
-D "_topdir $PWD" \
-D "version $VERSION" \
-D "release $RELEASE" \
-D "runtime_version $RUNTIME_VERSION" \
-D "docker_version $DOCKER_VERSION" \
SPECS/nvidia-docker2.spec && \
mv RPMS/noarch/*.rpm /dist

View file

@ -18,7 +18,6 @@ ARG DOCKER_VERSION
ENV DEBFULLNAME "NVIDIA CORPORATION"
ENV DEBEMAIL "cudatools@nvidia.com"
ENV REVISION "$PKG_VERS-$PKG_REV"
ENV RUNTIME_VERSION $RUNTIME_VERSION
ENV DOCKER_VERSION $DOCKER_VERSION
ENV SECTION ""
@ -33,7 +32,7 @@ COPY daemon.json $DIST_DIR/daemon.json
WORKDIR $DIST_DIR
COPY debian ./debian
RUN sed -i "s;@VERSION@;${REVISION#*+};" debian/changelog && \
RUN sed -i "s;@VERSION@;${REVISION};" debian/changelog && \
if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then exit 1; fi
CMD export DISTRIB="unstable" && \

View file

@ -19,7 +19,6 @@ ARG DOCKER_VERSION
ENV DEBFULLNAME "NVIDIA CORPORATION"
ENV DEBEMAIL "cudatools@nvidia.com"
ENV REVISION "$PKG_VERS-$PKG_REV"
ENV RUNTIME_VERSION $RUNTIME_VERSION
ENV DOCKER_VERSION $DOCKER_VERSION
ENV SECTION ""
@ -35,8 +34,8 @@ WORKDIR $DIST_DIR
COPY debian ./debian
RUN sed -i "s;@VERSION@;${REVISION#*+};" debian/changelog && \
if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then exit 1; fi
RUN sed -i "s;@VERSION@;${REVISION};" debian/changelog && \
if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then echo "$(dpkg-parsechangelog --show-field=Version)" && exit 1; fi
CMD export DISTRIB="$(lsb_release -cs)" && \
debuild --preserve-env --dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \

590
Makefile
View file

@ -3,562 +3,84 @@
DOCKER ?= docker
MKDIR ?= mkdir
VERSION := 2.0.3
VERSION := 2.1.0
PKG_REV := 1
RUNTIME_VERSION := 2.0.0
DIST_DIR := $(CURDIR)/dist
.NOTPARALLEL:
.PHONY: all
all: ubuntu18.04 ubuntu16.04 ubuntu14.04 debian9 debian8 centos7 amzn2 amzn1
all: ubuntu18.04 ubuntu16.04 debian9 centos7 amzn2 amzn1
ubuntu18.04: $(addsuffix -ubuntu18.04, 18.09.2 18.06.2 18.09.1 18.09.0 18.06.1 18.06.0 18.03.1 17.12.1)
ubuntu16.04: $(addsuffix -ubuntu16.04, 18.09.2 18.06.2 18.09.1 18.09.0 18.06.1 18.06.0 18.03.1 18.03.0 17.12.1 17.12.0 17.09.1 17.09.0 17.06.2 17.03.2 1.13.1 1.12.6)
ubuntu14.04: $(addsuffix -ubuntu14.04, 18.09.2 18.06.2 18.06.1 18.06.0 18.03.1 18.03.0 17.12.1 17.09.1 17.06.2 17.03.2)
debian9: $(addsuffix -debian9, 18.09.2 18.06.2 18.09.1 18.09.0 18.06.1 18.06.0 18.03.1 18.03.0 17.12.1 17.12.0 17.09.1 17.09.0 17.06.2 17.03.2)
debian8: $(addsuffix -debian8, 18.06.2 18.06.1 18.06.0 18.03.1 18.03.0 17.12.1 17.09.1 17.06.2)
centos7: $(addsuffix -centos7, 18.09.2.ce 18.06.2.ce 18.09.1.ce 18.09.0.ce 18.06.1.ce 18.06.0.ce 18.03.1.ce 18.03.0.ce 17.12.1.ce 17.12.0.ce 17.09.1.ce 17.09.0.ce 17.06.2.ce 17.03.2.ce 1.13.1 1.12.6)
amzn2: $(addsuffix -amzn2, 18.06.2-ce 18.06.1-ce 18.03.1-ce 17.06.2-ce)
amzn1: $(addsuffix -amzn1, 18.06.2-ce 18.06.1-ce 18.03.1-ce 17.12.1-ce 17.09.1-ce 17.06.2-ce 17.03.2-ce)
18.09.2-ubuntu18.04: ARCH := amd64
18.09.2-ubuntu18.04:
ubuntu18.04: ARCH := amd64
ubuntu18.04:
$(DOCKER) build --build-arg VERSION_ID="18.04" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.09.2-1" \
--build-arg DOCKER_VERSION="docker-ce (= 5:18.09.2~3-0~ubuntu-bionic) | docker-ee (= 5:18.09.2~3-0~ubuntu-bionic)" \
--build-arg PKG_VERS="$(VERSION)+docker18.09.2" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:18.04-docker18.09.2" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu18.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:18.04-docker18.09.2"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu18.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.09.1-ubuntu18.04: ARCH := amd64
18.09.1-ubuntu18.04:
$(DOCKER) build --build-arg VERSION_ID="18.04" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.09.1-1" \
--build-arg DOCKER_VERSION="docker-ce (= 5:18.09.1~3-0~ubuntu-bionic) | docker-ee (= 5:18.09.1~3-0~ubuntu-bionic)" \
--build-arg PKG_VERS="$(VERSION)+docker18.09.1" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:18.04-docker18.09.1" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu18.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:18.04-docker18.09.1"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu18.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.09.0-ubuntu18.04: ARCH := amd64
18.09.0-ubuntu18.04:
$(DOCKER) build --build-arg VERSION_ID="18.04" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.09.0-1" \
--build-arg DOCKER_VERSION="docker-ce (= 5:18.09.0~3-0~ubuntu-bionic) | docker-ee (= 5:18.09.0~3-0~ubuntu-bionic)" \
--build-arg PKG_VERS="$(VERSION)+docker18.09.0" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:18.04-docker18.09.0" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu18.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:18.04-docker18.09.0"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu18.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.06.2-ubuntu18.04: ARCH := amd64
18.06.2-ubuntu18.04:
$(DOCKER) build --build-arg VERSION_ID="18.04" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.06.2-1" \
--build-arg DOCKER_VERSION="docker-ce (= 18.06.2~ce~3-0~ubuntu) | docker-ee (= 18.06.2~ee~3-0~ubuntu)" \
--build-arg PKG_VERS="$(VERSION)+docker18.06.2" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:18.04-docker18.06.2" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu18.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:18.04-docker18.06.2"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu18.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.06.1-ubuntu18.04: ARCH := amd64
18.06.1-ubuntu18.04:
$(DOCKER) build --build-arg VERSION_ID="18.04" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.06.1-1" \
--build-arg DOCKER_VERSION="docker-ce (= 18.06.1~ce~3-0~ubuntu) | docker-ee (= 18.06.1~ee~3-0~ubuntu)" \
--build-arg PKG_VERS="$(VERSION)+docker18.06.1" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:18.04-docker18.06.1" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu18.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:18.04-docker18.06.1"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu18.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.06.0-ubuntu18.04: ARCH := amd64
18.06.0-ubuntu18.04:
$(DOCKER) build --build-arg VERSION_ID="18.04" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.06.0-1" \
--build-arg DOCKER_VERSION="docker-ce (= 18.06.0~ce~3-0~ubuntu) | docker-ee (= 18.06.0~ee~3-0~ubuntu)" \
--build-arg PKG_VERS="$(VERSION)+docker18.06.0" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:18.04-docker18.06.0" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu18.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:18.04-docker18.06.0"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu18.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.03.1-ubuntu18.04: ARCH := amd64
18.03.1-ubuntu18.04:
$(DOCKER) build --build-arg VERSION_ID="18.04" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.03.1-1" \
--build-arg DOCKER_VERSION="docker-ce (= 18.03.1~ce~3-0~ubuntu) | docker-ee (= 18.03.1~ee~3-0~ubuntu)" \
--build-arg PKG_VERS="$(VERSION)+docker18.03.1" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:18.04-docker18.03.1" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu18.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:18.04-docker18.03.1"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu18.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
17.12.1-ubuntu18.04: ARCH := amd64
17.12.1-ubuntu18.04:
$(DOCKER) build --build-arg VERSION_ID="18.04" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker17.12.1-1" \
--build-arg DOCKER_VERSION="docker.io (= 17.12.1-0ubuntu1)" \
--build-arg PKG_VERS="$(VERSION)+docker17.12.1" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:18.04-docker17.12.1" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu18.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:18.04-docker17.12.1"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu18.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
%-ubuntu16.04: ARCH := amd64
%-ubuntu16.04:
$(DOCKER) build --build-arg VERSION_ID="16.04" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker$*-1" \
--build-arg DOCKER_VERSION="docker-ce (= $*~ce-0~ubuntu) | docker-ee (= $*~ee-0~ubuntu)" \
--build-arg PKG_VERS="$(VERSION)+docker$*" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:16.04-docker$*" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu16.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:16.04-docker$*"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu16.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.09.2-ubuntu16.04: ARCH := amd64
18.09.2-ubuntu16.04:
$(DOCKER) build --build-arg VERSION_ID="16.04" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.09.2-1" \
--build-arg DOCKER_VERSION="docker-ce (= 5:18.09.2~3-0~ubuntu-xenial) | docker-ee (= 5:18.09.2~3-0~ubuntu-xenial)" \
--build-arg PKG_VERS="$(VERSION)+docker18.09.2" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:16.04-docker18.09.2" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu16.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:16.04-docker18.09.2"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu16.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.09.1-ubuntu16.04: ARCH := amd64
18.09.1-ubuntu16.04:
$(DOCKER) build --build-arg VERSION_ID="16.04" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.09.1-1" \
--build-arg DOCKER_VERSION="docker-ce (= 5:18.09.1~3-0~ubuntu-xenial) | docker-ee (= 5:18.09.1~3-0~ubuntu-xenial)" \
--build-arg PKG_VERS="$(VERSION)+docker18.09.1" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:16.04-docker18.09.1" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu16.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:16.04-docker18.09.1"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu16.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.09.0-ubuntu16.04: ARCH := amd64
18.09.0-ubuntu16.04:
$(DOCKER) build --build-arg VERSION_ID="16.04" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.09.0-1" \
--build-arg DOCKER_VERSION="docker-ce (= 5:18.09.0~3-0~ubuntu-xenial) | docker-ee (= 5:18.09.0~3-0~ubuntu-xenial)" \
--build-arg PKG_VERS="$(VERSION)+docker18.09.0" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:16.04-docker18.09.0" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu16.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:16.04-docker18.09.0"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu16.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.06.2-ubuntu16.04: ARCH := amd64
18.06.2-ubuntu16.04:
$(DOCKER) build --build-arg VERSION_ID="16.04" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.06.2-1" \
--build-arg DOCKER_VERSION="docker-ce (= 18.06.2~ce~3-0~ubuntu) | docker-ee (= 18.06.2~ee~3-0~ubuntu)" \
--build-arg PKG_VERS="$(VERSION)+docker18.06.2" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:16.04-docker18.06.2" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu16.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:16.04-docker18.06.2"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu16.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.06.1-ubuntu16.04: ARCH := amd64
18.06.1-ubuntu16.04:
$(DOCKER) build --build-arg VERSION_ID="16.04" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.06.1-1" \
--build-arg DOCKER_VERSION="docker-ce (= 18.06.1~ce~3-0~ubuntu) | docker-ee (= 18.06.1~ee~3-0~ubuntu)" \
--build-arg PKG_VERS="$(VERSION)+docker18.06.1" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:16.04-docker18.06.1" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu16.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:16.04-docker18.06.1"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu16.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.06.0-ubuntu16.04: ARCH := amd64
18.06.0-ubuntu16.04:
$(DOCKER) build --build-arg VERSION_ID="16.04" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.06.0-1" \
--build-arg DOCKER_VERSION="docker-ce (= 18.06.0~ce~3-0~ubuntu) | docker-ee (= 18.06.0~ee~3-0~ubuntu)" \
--build-arg PKG_VERS="$(VERSION)+docker18.06.0" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:16.04-docker18.06.0" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu16.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:16.04-docker18.06.0"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu16.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
17.03.2-ubuntu16.04: ARCH := amd64
17.03.2-ubuntu16.04:
$(DOCKER) build --build-arg VERSION_ID="16.04" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker17.03.2-1" \
--build-arg DOCKER_VERSION="docker-ce (= 17.03.2~ce-0~ubuntu-xenial) | docker-ee (= 17.03.2~ee-0~ubuntu-xenial)" \
--build-arg PKG_VERS="$(VERSION)+docker17.03.2" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:16.04-docker$*" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu16.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:16.04-docker$*"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu16.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
1.13.1-ubuntu16.04: ARCH := amd64
1.13.1-ubuntu16.04:
$(DOCKER) build --build-arg VERSION_ID="16.04" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker1.13.1-1" \
--build-arg DOCKER_VERSION="docker-engine (= 1.13.1-0~ubuntu-xenial) | docker.io (= 1.13.1-0ubuntu1~16.04.2)" \
--build-arg PKG_VERS="$(VERSION)+docker1.13.1" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:16.04-docker1.13.1" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu16.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:16.04-docker1.13.1"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu16.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
1.12.6-ubuntu16.04: ARCH := amd64
1.12.6-ubuntu16.04:
$(DOCKER) build --build-arg VERSION_ID="16.04" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker1.12.6-1" \
--build-arg DOCKER_VERSION="docker-engine (= 1.12.6-0~ubuntu-xenial) | docker.io (= 1.12.6-0ubuntu1~16.04.1)" \
--build-arg PKG_VERS="$(VERSION)+docker1.12.6" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:16.04-docker1.12.6" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu16.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:16.04-docker1.12.6"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu16.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
%-ubuntu14.04: ARCH := amd64
%-ubuntu14.04:
$(DOCKER) build --build-arg VERSION_ID="14.04" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker$*-1" \
--build-arg DOCKER_VERSION="docker-ce (= $*~ce-0~ubuntu) | docker-ee (= $*~ee-0~ubuntu)" \
--build-arg PKG_VERS="$(VERSION)+docker$*" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:14.04-docker$*" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu14.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:14.04-docker$*"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu14.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.06.2-ubuntu14.04: ARCH := amd64
18.06.2-ubuntu14.04:
$(DOCKER) build --build-arg VERSION_ID="14.04" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.06.2-1" \
--build-arg DOCKER_VERSION="docker-ce (= 18.06.2~ce~3-0~ubuntu) | docker-ee (= 18.06.2~ee~3-0~ubuntu)" \
--build-arg PKG_VERS="$(VERSION)+docker18.06.2" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:14.04-docker18.06.2" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu14.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:14.04-docker18.06.2"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu14.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.06.1-ubuntu14.04: ARCH := amd64
18.06.1-ubuntu14.04:
$(DOCKER) build --build-arg VERSION_ID="14.04" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.06.1-1" \
--build-arg DOCKER_VERSION="docker-ce (= 18.06.1~ce~3-0~ubuntu) | docker-ee (= 18.06.1~ee~3-0~ubuntu)" \
--build-arg PKG_VERS="$(VERSION)+docker18.06.1" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:14.04-docker18.06.1" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu14.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:14.04-docker18.06.1"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu14.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.06.0-ubuntu14.04: ARCH := amd64
18.06.0-ubuntu14.04:
$(DOCKER) build --build-arg VERSION_ID="14.04" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.06.0-1" \
--build-arg DOCKER_VERSION="docker-ce (= 18.06.0~ce~3-0~ubuntu) | docker-ee (= 18.06.0~ee~3-0~ubuntu)" \
--build-arg PKG_VERS="$(VERSION)+docker18.06.0" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:14.04-docker18.06.0" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu14.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:14.04-docker18.06.0"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu14.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
%-debian9: ARCH := amd64
%-debian9:
$(DOCKER) build --build-arg VERSION_ID="9" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker$*-1" \
--build-arg DOCKER_VERSION="docker-ce (= $*~ce-0~debian)" \
--build-arg PKG_VERS="$(VERSION)+docker$*" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/debian:9-docker$*" -f Dockerfile.debian .
$(MKDIR) -p $(DIST_DIR)/debian9/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/debian:9-docker$*"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/debian9/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.09.2-debian9: ARCH := amd64
18.09.2-debian9:
$(DOCKER) build --build-arg VERSION_ID="9" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.09.2-1" \
--build-arg DOCKER_VERSION="docker-ce (= 5:18.09.2~3-0~debian-stretch)" \
--build-arg PKG_VERS="$(VERSION)+docker18.09.2" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/debian:9-docker18.09.2" -f Dockerfile.debian .
$(MKDIR) -p $(DIST_DIR)/debian9/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/debian:9-docker18.09.2"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/debian9/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.09.1-debian9: ARCH := amd64
18.09.1-debian9:
$(DOCKER) build --build-arg VERSION_ID="9" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.09.1-1" \
--build-arg DOCKER_VERSION="docker-ce (= 5:18.09.1~3-0~debian-stretch)" \
--build-arg PKG_VERS="$(VERSION)+docker18.09.1" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/debian:9-docker18.09.1" -f Dockerfile.debian .
$(MKDIR) -p $(DIST_DIR)/debian9/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/debian:9-docker18.09.1"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/debian9/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.09.0-debian9: ARCH := amd64
18.09.0-debian9:
$(DOCKER) build --build-arg VERSION_ID="9" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.09.0-1" \
--build-arg DOCKER_VERSION="docker-ce (= 5:18.09.0~3-0~debian-stretch)" \
--build-arg PKG_VERS="$(VERSION)+docker18.09.0" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/debian:9-docker18.09.0" -f Dockerfile.debian .
$(MKDIR) -p $(DIST_DIR)/debian9/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/debian:9-docker18.09.0"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/debian9/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.06.2-debian9: ARCH := amd64
18.06.2-debian9:
$(DOCKER) build --build-arg VERSION_ID="9" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.06.2-1" \
--build-arg DOCKER_VERSION="docker-ce (= 18.06.2~ce~3-0~debian)" \
--build-arg PKG_VERS="$(VERSION)+docker18.06.2" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/debian:9-docker18.06.2" -f Dockerfile.debian .
$(MKDIR) -p $(DIST_DIR)/debian9/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/debian:9-docker18.06.2"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/debian9/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.06.1-debian9: ARCH := amd64
18.06.1-debian9:
$(DOCKER) build --build-arg VERSION_ID="9" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.06.1-1" \
--build-arg DOCKER_VERSION="docker-ce (= 18.06.1~ce~3-0~debian)" \
--build-arg PKG_VERS="$(VERSION)+docker18.06.1" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/debian:9-docker18.06.1" -f Dockerfile.debian .
$(MKDIR) -p $(DIST_DIR)/debian9/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/debian:9-docker18.06.1"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/debian9/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.06.0-debian9: ARCH := amd64
18.06.0-debian9:
$(DOCKER) build --build-arg VERSION_ID="9" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.06.0-1" \
--build-arg DOCKER_VERSION="docker-ce (= 18.06.0~ce~3-0~debian)" \
--build-arg PKG_VERS="$(VERSION)+docker18.06.0" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/debian:9-docker18.06.0" -f Dockerfile.debian .
$(MKDIR) -p $(DIST_DIR)/debian9/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/debian:9-docker18.06.0"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/debian9/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
17.03.2-debian9: ARCH := amd64
17.03.2-debian9:
$(DOCKER) build --build-arg VERSION_ID="9" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker17.03.2-1" \
--build-arg DOCKER_VERSION="docker-ce (= 17.03.2~ce-0~debian-stretch)" \
--build-arg PKG_VERS="$(VERSION)+docker17.03.2" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/debian:9-docker17.03.2" -f Dockerfile.debian .
$(MKDIR) -p $(DIST_DIR)/debian9/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/debian:9-docker17.03.2"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/debian9/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
%-debian8: ARCH := amd64
%-debian8:
$(DOCKER) build --build-arg VERSION_ID="8" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker$*-1" \
--build-arg DOCKER_VERSION="docker-ce (= $*~ce-0~debian)" \
--build-arg PKG_VERS="$(VERSION)+docker$*" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/debian:8-docker$*" -f Dockerfile.debian .
$(MKDIR) -p $(DIST_DIR)/debian8/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/debian:8-docker$*"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/debian8/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.06.2-debian8: ARCH := amd64
18.06.2-debian8:
$(DOCKER) build --build-arg VERSION_ID="8" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.06.2-1" \
--build-arg DOCKER_VERSION="docker-ce (= 18.06.2~ce~3-0~debian)" \
--build-arg PKG_VERS="$(VERSION)+docker18.06.2" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/debian:8-docker18.06.2" -f Dockerfile.debian .
$(MKDIR) -p $(DIST_DIR)/debian8/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/debian:8-docker18.06.2"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/debian8/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.06.1-debian8: ARCH := amd64
18.06.1-debian8:
$(DOCKER) build --build-arg VERSION_ID="8" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.06.1-1" \
--build-arg DOCKER_VERSION="docker-ce (= 18.06.1~ce~3-0~debian)" \
--build-arg PKG_VERS="$(VERSION)+docker18.06.1" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/debian:8-docker18.06.1" -f Dockerfile.debian .
$(MKDIR) -p $(DIST_DIR)/debian8/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/debian:8-docker18.06.1"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/debian8/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.06.0-debian8: ARCH := amd64
18.06.0-debian8:
$(DOCKER) build --build-arg VERSION_ID="8" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)+docker18.06.0-1" \
--build-arg DOCKER_VERSION="docker-ce (= 18.06.0~ce~3-0~debian)" \
--build-arg PKG_VERS="$(VERSION)+docker18.06.0" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/debian:8-docker18.06.0" -f Dockerfile.debian .
$(MKDIR) -p $(DIST_DIR)/debian8/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/debian:8-docker18.06.0"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/debian8/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
%.ce-centos7: ARCH := x86_64
%.ce-centos7:
$(DOCKER) build --build-arg VERSION_ID="7" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)-1.docker$*" \
--build-arg DOCKER_VERSION="docker-ce = $*.ce" \
--build-arg DOCKER_VERSION="docker-ce (>= 18.06.0~ce~3-0~ubuntu) | docker-ee (>= 18.06.0~ce~3-0~ubuntu) | docker.io (>= 18.06.0)" \
--build-arg PKG_VERS="$(VERSION)" \
--build-arg PKG_REV="$(PKG_REV).docker$*.ce" \
-t "nvidia/nvidia-docker2/centos:7-docker$*.ce" -f Dockerfile.centos .
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:18.04" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu18.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:18.04"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu18.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
ubuntu16.04: ARCH := amd64
ubuntu16.04:
$(DOCKER) build --build-arg VERSION_ID="16.04" \
--build-arg DOCKER_VERSION="docker-ce (>= 18.06.0~ce~3-0~ubuntu) | docker-ee (>= 18.06.0~ce~3-0~ubuntu) | docker.io (>= 18.06.0)" \
--build-arg PKG_VERS="$(VERSION)" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/ubuntu:16.04" -f Dockerfile.ubuntu .
$(MKDIR) -p $(DIST_DIR)/ubuntu16.04/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/ubuntu:16.04"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/ubuntu16.04/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
debian9: ARCH := amd64
debian9:
$(DOCKER) build --build-arg VERSION_ID="9" \
--build-arg DOCKER_VERSION="docker-ce (>= 18.06.0~ce~3-0~debian) | docker-ee (>= 18.06.0~ce~3-0~debian) | docker.io (>= 18.06.0)" \
--build-arg PKG_VERS="$(VERSION)" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/debian:9" -f Dockerfile.debian .
$(MKDIR) -p $(DIST_DIR)/debian9/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/debian:9"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/debian9/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
centos7: ARCH := x86_64
centos7:
$(DOCKER) build --build-arg VERSION_ID="7" \
--build-arg DOCKER_VERSION="docker-ce >= 18.06.3.ce-3.el7" \
--build-arg PKG_VERS="$(VERSION)" \
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/centos:7" -f Dockerfile.centos .
$(MKDIR) -p $(DIST_DIR)/centos7/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/centos:7-docker$*.ce"
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/centos:7"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/centos7/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.09.2.ce-centos7: ARCH := x86_64
18.09.2.ce-centos7:
$(DOCKER) build --build-arg VERSION_ID="7" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)-1.docker18.09.2" \
--build-arg DOCKER_VERSION="docker-ce = 3:18.09.2" \
--build-arg PKG_VERS="$(VERSION)" \
--build-arg PKG_REV="$(PKG_REV).docker18.09.2.ce" \
-t "nvidia/nvidia-docker2/centos:7-docker18.09.2.ce" -f Dockerfile.centos .
$(MKDIR) -p $(DIST_DIR)/centos7/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/centos:7-docker18.09.2.ce"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/centos7/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.09.1.ce-centos7: ARCH := x86_64
18.09.1.ce-centos7:
$(DOCKER) build --build-arg VERSION_ID="7" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)-1.docker18.09.1" \
--build-arg DOCKER_VERSION="docker-ce = 3:18.09.1" \
--build-arg PKG_VERS="$(VERSION)" \
--build-arg PKG_REV="$(PKG_REV).docker18.09.1.ce" \
-t "nvidia/nvidia-docker2/centos:7-docker18.09.1.ce" -f Dockerfile.centos .
$(MKDIR) -p $(DIST_DIR)/centos7/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/centos:7-docker18.09.1.ce"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/centos7/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
18.09.0.ce-centos7: ARCH := x86_64
18.09.0.ce-centos7:
$(DOCKER) build --build-arg VERSION_ID="7" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)-1.docker18.09.0" \
--build-arg DOCKER_VERSION="docker-ce = 3:18.09.0" \
--build-arg PKG_VERS="$(VERSION)" \
--build-arg PKG_REV="$(PKG_REV).docker18.09.0.ce" \
-t "nvidia/nvidia-docker2/centos:7-docker18.09.0.ce" -f Dockerfile.centos .
$(MKDIR) -p $(DIST_DIR)/centos7/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/centos:7-docker18.09.0.ce"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/centos7/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
%-centos7: ARCH := x86_64
%-centos7:
$(DOCKER) build --build-arg VERSION_ID="7" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)-1.docker$*" \
--build-arg DOCKER_VERSION="docker = 2:$*" \
--build-arg PKG_VERS="$(VERSION)" \
--build-arg PKG_REV="$(PKG_REV).docker$*" \
-t "nvidia/nvidia-docker2/centos:7-docker$*" -f Dockerfile.centos .
$(MKDIR) -p $(DIST_DIR)/centos7/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/centos:7-docker$*"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/centos7/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
%-ce-amzn2: ARCH := x86_64
%-ce-amzn2:
amzn2: ARCH := x86_64
amzn2:
$(DOCKER) build --build-arg VERSION_ID="2" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)-1.docker$*.amzn2" \
--build-arg DOCKER_VERSION="docker = $*ce" \
--build-arg DOCKER_VERSION="docker >= 18.06.1ce-2.amzn2" \
--build-arg PKG_VERS="$(VERSION)" \
--build-arg PKG_REV="$(PKG_REV).docker$*.ce.amzn2" \
-t "nvidia/nvidia-docker2/amzn:2-docker$*" -f Dockerfile.amzn .
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/amzn:2-docker" -f Dockerfile.amzn .
$(MKDIR) -p $(DIST_DIR)/amzn2/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/amzn:2-docker$*"
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/amzn:2-docker"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/amzn2/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid
%-ce-amzn1: ARCH := x86_64
%-ce-amzn1:
amzn1: ARCH := x86_64
amzn1:
$(DOCKER) build --build-arg VERSION_ID="1" \
--build-arg RUNTIME_VERSION="$(RUNTIME_VERSION)-1.docker$*.amzn1" \
--build-arg DOCKER_VERSION="docker = $*ce" \
--build-arg DOCKER_VERSION="docker >= 18.06.1ce-2.16.amzn1" \
--build-arg PKG_VERS="$(VERSION)" \
--build-arg PKG_REV="$(PKG_REV).docker$*.ce.amzn1" \
-t "nvidia/nvidia-docker2/amzn:1-docker$*" -f Dockerfile.amzn .
--build-arg PKG_REV="$(PKG_REV)" \
-t "nvidia/nvidia-docker2/amzn:1" -f Dockerfile.amzn .
$(MKDIR) -p $(DIST_DIR)/amzn1/$(ARCH)
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/amzn:1-docker$*"
$(DOCKER) run --cidfile $@.cid "nvidia/nvidia-docker2/amzn:1"
$(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/amzn1/$(ARCH)
$(DOCKER) rm $$(cat $@.cid) && rm $@.cid

2
debian/changelog vendored
View file

@ -1,4 +1,4 @@
nvidia-docker2 (2.0.3+@VERSION@) UNRELEASED; urgency=medium
nvidia-docker2 (@VERSION@) UNRELEASED; urgency=medium
* 2e9f20b Improve pass-through of docker arguments
* 4edca2f Pave the way for a hypothetical transitional package from v1

2
debian/control vendored
View file

@ -12,7 +12,7 @@ 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-runtime (>= 3.0.0), @DOCKER_VERSION@
Description: nvidia-docker CLI wrapper
Replaces nvidia-docker with a new implementation based on
nvidia-container-runtime

View file

@ -16,7 +16,7 @@ Source1: daemon.json
Source2: LICENSE
Conflicts: nvidia-docker < 2.0.0
Requires: nvidia-container-runtime = %{runtime_version}
Requires: nvidia-container-runtime >= 3.0.0
Requires: %{docker_version}
%description