From 863fa5cb8e2570a628335513dd161840594d607a Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 15 Jun 2016 10:28:26 +0100 Subject: [PATCH] default to Docker experimental; later we will need to do multiple builds Signed-off-by: Justin Cormack --- alpine/packages/docker/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/alpine/packages/docker/Makefile b/alpine/packages/docker/Makefile index c502e7db2..54a5fe3fb 100644 --- a/alpine/packages/docker/Makefile +++ b/alpine/packages/docker/Makefile @@ -1,12 +1,13 @@ DOCKER_VERSION=1.12.0-rc1 ARCH?=x86_64 OS?=Linux +EXPERIMENTAL?=1 all: bin bin: docker.git (cd docker.git && git fetch origin --tags && git checkout moby-$(DOCKER_VERSION)) - BIND_DIR=$(shell pwd) make -C docker.git binary + DOCKER_EXPERIMENTAL=$(EXPERIMENTAL) BIND_DIR=$(shell pwd) make -C docker.git binary mkdir -p bin cp docker.git/bundles/latest/binary-daemon/{dockerd,docker-runc} bin/ cp docker.git/bundles/latest/binary-daemon/{docker-containerd,docker-containerd-shim,docker-containerd-ctr} bin/