update to 1.12.0-rc4 upstream version

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2016-07-13 09:50:25 +01:00
parent 84e90a538b
commit 261544cf02

View File

@ -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