From 2e67fa91b754da74cd5fbc4df3211ac0df729f4b Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 11 Oct 2016 11:32:34 +0100 Subject: [PATCH 1/3] Make the Docker download more robust to pipefail errors Signed-off-by: Justin Cormack --- alpine/packages/docker/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/alpine/packages/docker/Makefile b/alpine/packages/docker/Makefile index 3a6f5e8b2..1178da125 100644 --- a/alpine/packages/docker/Makefile +++ b/alpine/packages/docker/Makefile @@ -30,14 +30,15 @@ endif cleanusr: mkdir -p usr/bin - rm -f usr/bin/* + rm -f usr/bin/* ok download: cleanusr ifdef DOCKER_BIN_URL - curl -sSL ${DOCKER_BIN_URL} | tar xzf - + (curl -sSL ${DOCKER_BIN_URL} && touch ok) | tar xzf - else - curl -sSL https://${DOCKER_HOST}/builds/${OS}/${ARCH}/docker-${DOCKER_VERSION}.tgz | tar xzf - + (curl -sSL https://${DOCKER_HOST}/builds/${OS}/${ARCH}/docker-${DOCKER_VERSION}.tgz && touch ok) | tar xzf - endif + rm ok mv docker/docker-containerd-ctr \ docker/docker \ docker/docker-containerd \ @@ -49,10 +50,11 @@ endif ([ -e docker/docker-init ] && mv docker/docker-init usr/bin/) || true hub: cleanusr - docker run --rm $(DOCKER_IMAGE) tar cf - -C /usr/local/bin . | tar xf - -C usr/bin + (docker run --rm $(DOCKER_IMAGE) tar cf - -C /usr/local/bin . && touch ok) | tar xf - -C usr/bin + rm ok rm -f usr/bin/docker-entrypoint.sh clean: - rm -rf usr/ docker/ + rm -rf usr/ docker/ ok .DELETE_ON_ERROR: From 9b0f64044a3294eb5758df23f6c6dba00f2244a4 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 11 Oct 2016 11:33:29 +0100 Subject: [PATCH 2/3] Update Docker to 1.12.2 Signed-off-by: Justin Cormack --- alpine/packages/docker/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/packages/docker/Makefile b/alpine/packages/docker/Makefile index 1178da125..01063c048 100644 --- a/alpine/packages/docker/Makefile +++ b/alpine/packages/docker/Makefile @@ -1,4 +1,4 @@ -DOCKER_VERSION?=1.12.2-rc3 +DOCKER_VERSION?=1.12.2 ARCH?=x86_64 OS?=Linux DOCKER_EXPERIMENTAL?=1 From fa268fbdf3ddb763350a4c3c66660a9776024438 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 12 Oct 2016 00:48:18 +0100 Subject: [PATCH 3/3] temporarily force curl as image not yet available Signed-off-by: Justin Cormack --- alpine/packages/docker/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/alpine/packages/docker/Makefile b/alpine/packages/docker/Makefile index 01063c048..3fbc95174 100644 --- a/alpine/packages/docker/Makefile +++ b/alpine/packages/docker/Makefile @@ -1,4 +1,5 @@ DOCKER_VERSION?=1.12.2 +FORCE_CURL?=1 ARCH?=x86_64 OS?=Linux DOCKER_EXPERIMENTAL?=1