From 7981157503a1a67f3a9160f367b518241555d522 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 26 Aug 2016 09:18:15 +0100 Subject: [PATCH] Always copy in docker-proxy Fix #434 Stupid mistake, sorry! Signed-off-by: Justin Cormack --- alpine/packages/docker/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/alpine/packages/docker/Makefile b/alpine/packages/docker/Makefile index 655b07560..a4f0b42ef 100644 --- a/alpine/packages/docker/Makefile +++ b/alpine/packages/docker/Makefile @@ -8,8 +8,6 @@ all: bin TEST_HOST=$(shell if echo "$(DOCKER_VERSION)" | grep -q -- '-rc'; then echo "test.docker.com"; else echo "get.docker.com"; fi) DOCKER_HOST?=$(shell [ "${DOCKER_EXPERIMENTAL}" -eq 1 ] && printf "experimental.docker.com" || printf "${TEST_HOST}") -# Note we do not copy docker-proxy in as we override with our own version - bin: mkdir -p bin curl -sSL -o docker.tgz https://${DOCKER_HOST}/builds/${OS}/${ARCH}/docker-${DOCKER_VERSION}.tgz @@ -18,6 +16,7 @@ bin: docker/docker \ docker/docker-containerd \ docker/dockerd \ + docker/docker-proxy \ docker/docker-runc \ docker/docker-containerd-shim \ bin/