Merge pull request #930 from justincormack/docker-master

Add a build flag to build from master
This commit is contained in:
Justin Cormack 2016-12-28 18:57:38 +00:00 committed by GitHub
commit 1a85a04628

View File

@ -14,6 +14,17 @@ endif
DOCKER_IMAGE?=docker:$(DOCKER_VERSION)
ifeq ($(DOCKER_VERSION),master)
ifeq ($(OS),Linux)
OS=linux
endif
ifeq ($(ARCH),x86_64)
ARCH=amd64
endif
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),)