From 0d08098b09bc0c17807d5a30a13d9477aeac6e5e Mon Sep 17 00:00:00 2001
From: Justin Cormack <justin.cormack@docker.com>
Date: Tue, 27 Sep 2016 22:26:29 +0100
Subject: [PATCH] Fix code for downloading Docker for release candidates

These always need to be downloaded with curl.

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

diff --git a/alpine/packages/docker/Makefile b/alpine/packages/docker/Makefile
index 153c80078..f65303599 100644
--- a/alpine/packages/docker/Makefile
+++ b/alpine/packages/docker/Makefile
@@ -5,7 +5,13 @@ DOCKER_EXPERIMENTAL?=1
 
 all: usr/bin/docker
 
-TEST_HOST=$(shell if echo "$(DOCKER_VERSION)" | grep -q -- '-rc'; then echo "test.docker.com"; else echo "get.docker.com"; fi)
+RELEASE_CANDIDATE=$(findstring -rc,$(DOCKER_VERSION))
+ifeq ($(RELEASE_CANDIDATE),-rc)
+TEST_HOST=test.docker.com
+else
+TEST_HOST=get.docker.com
+endif
+
 ifeq ($(DOCKER_EXPERIMENTAL),1)
 DOCKER_HOST=experimental.docker.com
 DOCKER_IMAGE?=docker:$(DOCKER_VERSION)-experimental
@@ -16,7 +22,7 @@ endif
 
 .PHONY: download hub cleanusr
 
-ifeq ($(DOCKER_BIN_URL)$(FORCE_CURL),)
+ifeq ($(DOCKER_BIN_URL)$(FORCE_CURL)$(RELEASE_CANDIDATE),)
 usr/bin/docker: hub
 else
 usr/bin/docker: download