0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3494 from tianon/makefile-use-branch-tag

Browse source 
Update Makefile to use "docker:GIT_BRANCH" as the generated image name
This commit is contained in:
Tianon Gravi 2014-01-08 14:47:41 -08:00
commit 82aed48bbc
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -1,6 +1,9 @@
.PHONY: all binary build cross default docs shell test
DOCKER_RUN_DOCKER := docker run -rm -i -t -privileged -e TESTFLAGS -v $(CURDIR)/bundles:/go/src/github.com/dotcloud/docker/bundles docker
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
DOCKER_IMAGE := docker:$(GIT_BRANCH)
DOCKER_DOCS_IMAGE := docker-docs:$(GIT_BRANCH)
DOCKER_RUN_DOCKER := docker run -rm -i -t -privileged -e TESTFLAGS -v $(CURDIR)/bundles:/go/src/github.com/dotcloud/docker/bundles "$(DOCKER_IMAGE)"
default: binary
@ -14,7 +17,8 @@ cross: build
$(DOCKER_RUN_DOCKER) hack/make.sh binary cross
docs:
docker build -t docker-docs docs && docker run -p 8000:8000 docker-docs
docker build -rm -t "$(DOCKER_DOCS_IMAGE)" docs
docker run -rm -i -t -p 8000:8000 "$(DOCKER_DOCS_IMAGE)"
test: build
$(DOCKER_RUN_DOCKER) hack/make.sh test test-integration
@ -23,7 +27,7 @@ shell: build
$(DOCKER_RUN_DOCKER) bash
build: bundles
docker build -t docker .
docker build -rm -t "$(DOCKER_IMAGE)" .
bundles:
mkdir bundles