From a95712899e33f267a3061fa94d05189e7c371eaa Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 7 Jan 2014 18:38:07 -0700 Subject: [PATCH] Update Makefile to use "docker:GIT_BRANCH" as the generated image name for increased versatility ... and other minor Makefile improvements :) Docker-DCO-1.0-Signed-off-by: Andrew Page (github: tianon) --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 86b2a0207f..d5253d86ce 100644 --- a/Makefile +++ b/Makefile @@ -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