mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-27 20:48:11 +00:00
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>
This commit is contained in:
parent
55444549cd
commit
0d08098b09
@ -5,7 +5,13 @@ DOCKER_EXPERIMENTAL?=1
|
|||||||
|
|
||||||
all: usr/bin/docker
|
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)
|
ifeq ($(DOCKER_EXPERIMENTAL),1)
|
||||||
DOCKER_HOST=experimental.docker.com
|
DOCKER_HOST=experimental.docker.com
|
||||||
DOCKER_IMAGE?=docker:$(DOCKER_VERSION)-experimental
|
DOCKER_IMAGE?=docker:$(DOCKER_VERSION)-experimental
|
||||||
@ -16,7 +22,7 @@ endif
|
|||||||
|
|
||||||
.PHONY: download hub cleanusr
|
.PHONY: download hub cleanusr
|
||||||
|
|
||||||
ifeq ($(DOCKER_BIN_URL)$(FORCE_CURL),)
|
ifeq ($(DOCKER_BIN_URL)$(FORCE_CURL)$(RELEASE_CANDIDATE),)
|
||||||
usr/bin/docker: hub
|
usr/bin/docker: hub
|
||||||
else
|
else
|
||||||
usr/bin/docker: download
|
usr/bin/docker: download
|
||||||
|
Loading…
Reference in New Issue
Block a user