From c627c0e6437cbeb7f5f2bc612de126824cded71f Mon Sep 17 00:00:00 2001 From: David Scott Date: Sun, 3 Apr 2016 18:32:04 +0100 Subject: [PATCH] docker: compile from scratch rather than download binaries A later patch will apply a non-upstream patch to docker. Signed-off-by: David Scott --- alpine/packages/docker/.gitignore | 1 + alpine/packages/docker/Makefile | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/alpine/packages/docker/.gitignore b/alpine/packages/docker/.gitignore index e660fd93d..861389dec 100644 --- a/alpine/packages/docker/.gitignore +++ b/alpine/packages/docker/.gitignore @@ -1 +1,2 @@ bin/ +docker.git diff --git a/alpine/packages/docker/Makefile b/alpine/packages/docker/Makefile index 16824ea3e..3af3d4745 100644 --- a/alpine/packages/docker/Makefile +++ b/alpine/packages/docker/Makefile @@ -1,14 +1,19 @@ -all: docker - DOCKER_VERSION=1.11.0-rc3 ARCH?=x86_64 OS?=Linux -DOCKER_HOST=$(shell if echo "$(DOCKER_VERSION)" | grep -q -- '-rc'; then echo "test.docker.com"; else echo "get.docker.com"; fi) -docker: +all: bin + +bin: docker.git + (cd docker.git && git fetch origin --tags && git checkout v${DOCKER_VERSION}) + BIND_DIR=$(shell pwd) make -C docker.git binary mkdir -p bin - if [ "${ARCH}" != "arm" ] ; then 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; else cp docker-arm bin/docker; fi - chmod +x bin/* + cp docker.git/bundles/${DOCKER_VERSION}/binary/* bin/ + rm -f bin/*.md5 + rm -f bin/*.sha256 + +docker.git: + git clone git://github.com/docker/docker.git docker.git clean: rm -rf bin