github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-28 04:58:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #787 from justincormack/no-experimental

Browse Source 
Remove last references to EXPERIMENTAL
This commit is contained in:
Justin Cormack 2016-11-24 05:44:27 -08:00 committed by GitHub
commit 9f8c557ce7
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
alpine/packages/docker/Makefile
View File

@ -2,24 +2,17 @@ DOCKER_VERSION?=1.13.0-rc2
FORCE_CURL?=1 FORCE_CURL?=1
ARCH?=x86_64 ARCH?=x86_64
OS?=Linux OS?=Linux
DOCKER_EXPERIMENTAL?=0
all: usr/bin/docker all: usr/bin/docker
RELEASE_CANDIDATE=$(findstring -rc,$(DOCKER_VERSION)) RELEASE_CANDIDATE=$(findstring -rc,$(DOCKER_VERSION))
ifeq ($(RELEASE_CANDIDATE),-rc) ifeq ($(RELEASE_CANDIDATE),-rc)
TEST_HOST=test.docker.com DOCKER_HOST=test.docker.com
else else
TEST_HOST=get.docker.com DOCKER_HOST=get.docker.com
endif 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) DOCKER_IMAGE?=docker:$(DOCKER_VERSION)
endif
.PHONY: download hub cleanusr .PHONY: download hub cleanusr