From a18c3d4c0a633ac05909ff7965332df117ff34d2 Mon Sep 17 00:00:00 2001
From: Justin Cormack <justin.cormack@docker.com>
Date: Tue, 28 Feb 2017 14:22:04 -0800
Subject: [PATCH] Remove ability to pull docker from hub

We never used this as updates too slow and out of our control.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
---
 alpine/packages/docker/Makefile | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/alpine/packages/docker/Makefile b/alpine/packages/docker/Makefile
index 7d6ab2f79..1833f87d7 100644
--- a/alpine/packages/docker/Makefile
+++ b/alpine/packages/docker/Makefile
@@ -1,6 +1,5 @@
 DOCKER_BIN_URL?=https://s3.amazonaws.com/editions-stage-us-east-1-150610-005505/linux/static/stable/x86_64/docker-17.03.0-ce.tgz
 DOCKER_VERSION?=17.03.0-ce
-FORCE_CURL?=1
 ARCH?=x86_64
 OS?=Linux
 
@@ -28,21 +27,11 @@ MASTER_VERSION:=$(shell curl -fsSL https://master.dockerproject.org/version)
 DOCKER_BIN_URL=https://master.dockerproject.org/$(OS)/$(ARCH)/docker-$(MASTER_VERSION).tgz
 endif
 
-.PHONY: download hub cleanusr
-
-ifeq ($(DOCKER_BIN_URL)$(FORCE_CURL)$(RELEASE_CANDIDATE),)
-usr/bin/docker: Makefile hub
-else
-usr/bin/docker: Makefile download
-endif
-
-cleanusr:
-	mkdir -p usr/bin
-	rm -f usr/bin/* ok
-
 S3_PREFIX=s3://
 
-download: cleanusr
+usr/bin/docker: Makefile
+	mkdir -p usr/bin
+	rm -f usr/bin/* ok
 ifdef DOCKER_BIN_URL
 ifeq ($(filter $(S3_PREFIX)%, $(DOCKER_BIN_URL)),)
 	(curl -fsSL "${DOCKER_BIN_URL}" && touch ok) | tar xzf -
@@ -74,11 +63,6 @@ endif
 	([ -e docker/docker-init ] && mv docker/docker-init usr/bin/) || true
 	([ -d docker/completion ] && rm -rf docker/completion) || true
 
-hub: cleanusr
-	(DOCKER_CONTENT_TRUST=1 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/ ok