Add support for Docker 18.03.1 on Ubuntu 18.04

This commit is contained in:
Felix Abecassis 2018-06-21 11:10:33 -07:00
parent 16345fb10e
commit 16d6ae0fe3

View file

@ -13,7 +13,7 @@ DIST_DIR := $(CURDIR)/dist
all: ubuntu18.04 ubuntu16.04 ubuntu14.04 debian9 debian8 centos7 amzn2 amzn1
ubuntu18.04: $(addsuffix -ubuntu18.04, 17.12.1)
ubuntu18.04: $(addsuffix -ubuntu18.04, 18.03.1 17.12.1)
ubuntu16.04: $(addsuffix -ubuntu16.04, 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)
@ -29,14 +29,14 @@ amzn2: $(addsuffix -amzn2, 17.06.2.ce)
amzn1: $(addsuffix -amzn1, 18.03.1.ce 17.12.1.ce 17.09.1.ce 17.06.2.ce 17.03.2.ce)
%-ubuntu18.04:
18.03.1-ubuntu18.04:
$(DOCKER) build --build-arg VERSION_ID="18.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 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-docker$*" -f Dockerfile.ubuntu .
$(DOCKER) run --rm -v $(DIST_DIR)/ubuntu18.04:/dist:Z "nvidia/nvidia-docker2/ubuntu:18.04-docker$*"
-t "nvidia/nvidia-docker2/ubuntu:18.04-docker18.03.1" -f Dockerfile.ubuntu .
$(DOCKER) run --rm -v $(DIST_DIR)/ubuntu18.04:/dist:Z "nvidia/nvidia-docker2/ubuntu:18.04-docker18.03.1"
17.12.1-ubuntu18.04:
$(DOCKER) build --build-arg VERSION_ID="18.04" \