From 10bd1e526d0ad26411d72cd1fe0f20d64eed69ab Mon Sep 17 00:00:00 2001 From: French Ben Date: Fri, 24 Feb 2017 10:55:03 -0800 Subject: [PATCH 1/6] Added support for bundles generated from CI Signed-off-by: French Ben --- alpine/packages/docker/Makefile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/alpine/packages/docker/Makefile b/alpine/packages/docker/Makefile index b15029c77..88d998dd2 100644 --- a/alpine/packages/docker/Makefile +++ b/alpine/packages/docker/Makefile @@ -1,7 +1,8 @@ -DOCKER_VERSION?=17.03.0-ce-rc1 +DOCKER_VERSION?=${BUNDLE}-rc1 FORCE_CURL?=1 ARCH?=x86_64 OS?=Linux +BUNDLE?= AWS_CLI_IMAGE=mobylinux/aws-cli:9432b650794d38a70cf00be4da971367c52d1d5b@sha256:679f6f45fb8598cab90888733a07ddeeb26a27a7889114f89aaf712eaa3abe06 @@ -52,6 +53,16 @@ else (curl -fsSL https://${DOCKER_HOST}/builds/${OS}/${ARCH}/docker-${DOCKER_VERSION}.tgz && touch ok) | tar xzf - endif rm ok +ifdef BUNDLE + mv bundles/${BUNDLE}/binary-daemon/docker-containerd-ctr \ + bundles/${BUNDLE}/binary-client/docker \ + bundles/${BUNDLE}/binary-daemon/docker-containerd \ + bundles/${BUNDLE}/binary-daemon/dockerd \ + bundles/${BUNDLE}/binary-daemon/docker-proxy \ + bundles/${BUNDLE}/binary-daemon/docker-runc \ + bundles/${BUNDLE}/binary-daemon/docker-containerd-shim \ + usr/bin/ +else mv docker/docker-containerd-ctr \ docker/docker \ docker/docker-containerd \ @@ -60,6 +71,7 @@ endif docker/docker-runc \ docker/docker-containerd-shim \ usr/bin/ +endif ([ -e docker/docker-init ] && mv docker/docker-init usr/bin/) || true ([ -d docker/completion ] && rm -rf docker/completion) || true From 6752ad55110aca45b6ce155770dea4cbf55d89b4 Mon Sep 17 00:00:00 2001 From: French Ben Date: Fri, 24 Feb 2017 10:57:20 -0800 Subject: [PATCH 2/6] Flexible docker version Signed-off-by: French Ben --- alpine/packages/docker/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/alpine/packages/docker/Makefile b/alpine/packages/docker/Makefile index 88d998dd2..4f9fe658c 100644 --- a/alpine/packages/docker/Makefile +++ b/alpine/packages/docker/Makefile @@ -1,8 +1,13 @@ -DOCKER_VERSION?=${BUNDLE}-rc1 +BUNDLE?= +ifdef BUNDLE +DOCKER_VERSION?=${BUNDLE} +else +DOCKER_VERSION?=17.03.0-ce-rc1 +endif FORCE_CURL?=1 ARCH?=x86_64 OS?=Linux -BUNDLE?= + AWS_CLI_IMAGE=mobylinux/aws-cli:9432b650794d38a70cf00be4da971367c52d1d5b@sha256:679f6f45fb8598cab90888733a07ddeeb26a27a7889114f89aaf712eaa3abe06 From efde709ed5ae4ade2d7d6795bb2e11fe53bd6803 Mon Sep 17 00:00:00 2001 From: French Ben Date: Mon, 27 Feb 2017 14:26:44 -0800 Subject: [PATCH 3/6] Removed unneeded var Signed-off-by: French Ben --- alpine/packages/docker/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/alpine/packages/docker/Makefile b/alpine/packages/docker/Makefile index 4f9fe658c..d6018e28c 100644 --- a/alpine/packages/docker/Makefile +++ b/alpine/packages/docker/Makefile @@ -1,4 +1,3 @@ -BUNDLE?= ifdef BUNDLE DOCKER_VERSION?=${BUNDLE} else From a76ddbc51d7fade449da3bee185350650caa5a56 Mon Sep 17 00:00:00 2001 From: French Ben Date: Mon, 27 Feb 2017 15:45:15 -0800 Subject: [PATCH 4/6] Removed extra line Signed-off-by: French Ben --- alpine/packages/docker/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/alpine/packages/docker/Makefile b/alpine/packages/docker/Makefile index d6018e28c..e493dee09 100644 --- a/alpine/packages/docker/Makefile +++ b/alpine/packages/docker/Makefile @@ -7,7 +7,6 @@ FORCE_CURL?=1 ARCH?=x86_64 OS?=Linux - AWS_CLI_IMAGE=mobylinux/aws-cli:9432b650794d38a70cf00be4da971367c52d1d5b@sha256:679f6f45fb8598cab90888733a07ddeeb26a27a7889114f89aaf712eaa3abe06 all: usr/bin/docker From 8d0197d4033861d17285efb0e72699780816a911 Mon Sep 17 00:00:00 2001 From: French Ben Date: Mon, 27 Feb 2017 16:19:29 -0800 Subject: [PATCH 5/6] Added bundle detection Signed-off-by: French Ben --- alpine/packages/docker/Makefile | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/alpine/packages/docker/Makefile b/alpine/packages/docker/Makefile index e493dee09..bd08f78ab 100644 --- a/alpine/packages/docker/Makefile +++ b/alpine/packages/docker/Makefile @@ -1,8 +1,4 @@ -ifdef BUNDLE -DOCKER_VERSION?=${BUNDLE} -else -DOCKER_VERSION?=17.03.0-ce-rc1 -endif +DOCKER_VERSION?=17.03.0-ce FORCE_CURL?=1 ARCH?=x86_64 OS?=Linux @@ -56,16 +52,16 @@ else (curl -fsSL https://${DOCKER_HOST}/builds/${OS}/${ARCH}/docker-${DOCKER_VERSION}.tgz && touch ok) | tar xzf - endif rm ok -ifdef BUNDLE - mv bundles/${BUNDLE}/binary-daemon/docker-containerd-ctr \ - bundles/${BUNDLE}/binary-client/docker \ - bundles/${BUNDLE}/binary-daemon/docker-containerd \ - bundles/${BUNDLE}/binary-daemon/dockerd \ - bundles/${BUNDLE}/binary-daemon/docker-proxy \ - bundles/${BUNDLE}/binary-daemon/docker-runc \ - bundles/${BUNDLE}/binary-daemon/docker-containerd-shim \ - usr/bin/ -else + if [ -d "./bundles" ]; then \ + mv bundles/${DOCKER_VERSION}/binary-daemon/docker-containerd-ctr \ + bundles/${DOCKER_VERSION}/binary-client/docker \ + bundles/${DOCKER_VERSION}/binary-daemon/docker-containerd \ + bundles/${DOCKER_VERSION}/binary-daemon/dockerd \ + bundles/${DOCKER_VERSION}/binary-daemon/docker-proxy \ + bundles/${DOCKER_VERSION}/binary-daemon/docker-runc \ + bundles/${DOCKER_VERSION}/binary-daemon/docker-containerd-shim \ + usr/bin/ ;\ + else \ mv docker/docker-containerd-ctr \ docker/docker \ docker/docker-containerd \ @@ -73,8 +69,7 @@ else docker/docker-proxy \ docker/docker-runc \ docker/docker-containerd-shim \ - usr/bin/ -endif + usr/bin/ ; fi ([ -e docker/docker-init ] && mv docker/docker-init usr/bin/) || true ([ -d docker/completion ] && rm -rf docker/completion) || true From 66710a38a26a99f5702ca88792713814f4238684 Mon Sep 17 00:00:00 2001 From: French Ben Date: Mon, 27 Feb 2017 17:01:58 -0800 Subject: [PATCH 6/6] Fixed docker version Signed-off-by: French Ben --- 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 bd08f78ab..3b5b29b69 100644 --- a/alpine/packages/docker/Makefile +++ b/alpine/packages/docker/Makefile @@ -1,4 +1,4 @@ -DOCKER_VERSION?=17.03.0-ce +DOCKER_VERSION?=17.03.0-ce-rc1 FORCE_CURL?=1 ARCH?=x86_64 OS?=Linux