From 261544cf024ab3c8158e775d4cb8af7a217b213e Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 13 Jul 2016 09:50:25 +0100 Subject: [PATCH] update to 1.12.0-rc4 upstream version Signed-off-by: Justin Cormack --- alpine/packages/docker/Makefile | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/alpine/packages/docker/Makefile b/alpine/packages/docker/Makefile index 857933803..e630483fc 100644 --- a/alpine/packages/docker/Makefile +++ b/alpine/packages/docker/Makefile @@ -1,24 +1,19 @@ -DOCKER_VERSION=1.12.0-rc3 +DOCKER_VERSION=1.12.0-rc4 ARCH?=x86_64 OS?=Linux EXPERIMENTAL?=1 all: bin -bin: docker.git - (cd docker.git && git fetch origin --tags && git checkout moby-$(DOCKER_VERSION)) - DOCKER_EXPERIMENTAL=$(EXPERIMENTAL) BIND_DIR=$(shell pwd) make -C docker.git binary - mkdir -p bin - cp docker.git/bundles/latest/binary-daemon/dockerd bin/ - cp docker.git/bundles/latest/binary-daemon/docker-runc bin/ - cp docker.git/bundles/latest/binary-daemon/docker-containerd bin/ - cp docker.git/bundles/latest/binary-daemon/docker-containerd-shim bin/ - cp docker.git/bundles/latest/binary-daemon/docker-containerd-ctr bin/ - cp docker.git/bundles/latest/binary-daemon/docker-proxy bin/ - cp docker.git/bundles/latest/binary-client/docker bin/ +#DOCKER_HOST=$(shell if echo "$(DOCKER_VERSION)" | grep -q -- '-rc'; then echo "test.docker.com"; else echo "get.docker.com"; fi) +DOCKER_HOST=experimental.docker.com -docker.git: - git clone git://github.com/djs55/docker.git docker.git +bin: + mkdir -p bin + curl -f -L -o docker.tgz https://${DOCKER_HOST}/builds/${OS}/${ARCH}/docker-${DOCKER_VERSION}.tgz + tar xzf docker.tgz && mv docker/* bin + rm -rf docker/ docker.tgz + chmod +x bin/* arm: mkdir -p bin @@ -26,4 +21,4 @@ arm: cp docker-arm bin/docker clean: - rm -rf bin docker.git + rm -rf bin docker/ docker.tgz