From 997550c1a2e757a42bfa82c20a3cbc0e614a35ee Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Thu, 24 Nov 2016 13:36:22 +0000 Subject: [PATCH] Remove last references to EXPERIMENTAL Only support 1.13 now, experimental is a runtime flag. see #647 Signed-off-by: Justin Cormack --- alpine/packages/docker/Makefile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/alpine/packages/docker/Makefile b/alpine/packages/docker/Makefile index 344ad5a99..cc84c149e 100644 --- a/alpine/packages/docker/Makefile +++ b/alpine/packages/docker/Makefile @@ -2,24 +2,17 @@ DOCKER_VERSION?=1.13.0-rc2 FORCE_CURL?=1 ARCH?=x86_64 OS?=Linux -DOCKER_EXPERIMENTAL?=0 all: usr/bin/docker RELEASE_CANDIDATE=$(findstring -rc,$(DOCKER_VERSION)) ifeq ($(RELEASE_CANDIDATE),-rc) -TEST_HOST=test.docker.com +DOCKER_HOST=test.docker.com else -TEST_HOST=get.docker.com +DOCKER_HOST=get.docker.com endif -ifeq ($(DOCKER_EXPERIMENTAL),1) -DOCKER_HOST=experimental.docker.com -DOCKER_IMAGE?=docker:$(DOCKER_VERSION)-experimental -else -DOCKER_HOST=$(TEST_HOST) DOCKER_IMAGE?=docker:$(DOCKER_VERSION) -endif .PHONY: download hub cleanusr