Skip to content

Commit 57af648

Browse files
mboersmaGabriel Monroy
mboersma
authored and
Gabriel Monroy
committed
ref(Makefiles): use $BUILD_TAG, which defaults to "git rev-parse"
1 parent 466b689 commit 57af648

9 files changed

Lines changed: 47 additions & 51 deletions

File tree

‎Makefile‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,7 @@ START_ORDER=logger database cache registry controller builder router
1010
all: build run
1111

1212
dev-registry: check-docker
13-
@# pull registry image if it doesn't already exist
14-
@docker history registry:0.8.1 >/dev/null 2>&1 || docker pull registry:0.8.1
15-
16-
@# run registry container if it doesn't already exist
17-
@docker inspect registry >/dev/null 2>&1 || docker run -d -p 5000:5000 --name registry registry:0.8.1
18-
13+
@docker run -d -p 5000:5000 --name registry registry:0.8.1
1914
@echo
2015
@echo "To configure the registry for local Deis development:"
2116
@echo " export DEIS_REGISTRY=`boot2docker ip 2>/dev/null`:5000"
@@ -50,8 +45,7 @@ test: test-components test-integration
5045
test-components:
5146
@$(foreach C,$(COMPONENTS), \
5247
echo \\nTesting deis/$(C) ; \
53-
$(MAKE) -C $(C) test ; \
54-
)
48+
$(MAKE) -C $(C) build test ;)
5549

5650
test-integration:
5751
$(MAKE) -C tests/ test-full

‎builder/Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
include ../includes.mk
22

33
build: check-docker
4-
docker build -t deis/builder:$(GIT_TAG) .
4+
docker build -t deis/builder:$(BUILD_TAG) .
55

66
push: check-docker check-registry check-deisctl
7-
docker tag deis/builder:$(GIT_TAG) $(REGISTRY)/deis/builder:$(GIT_TAG)
8-
docker push $(REGISTRY)/deis/builder:$(GIT_TAG)
9-
deisctl config builder set image=$$DEIS_REGISTRY/deis/builder:$(GIT_TAG)
7+
docker tag deis/builder:$(BUILD_TAG) $(REGISTRY)/deis/builder:$(BUILD_TAG)
8+
docker push $(REGISTRY)/deis/builder:$(BUILD_TAG)
9+
deisctl config builder set image=$(REGISTRY)/deis/builder:$(BUILD_TAG)
1010

1111
clean: check-docker check-registry
12-
docker rmi deis/builder:$(GIT_TAG)
13-
docker rmi $(REGISTRY)/deis/builder:$(GIT_TAG)
12+
docker rmi deis/builder:$(BUILD_TAG)
13+
docker rmi $(REGISTRY)/deis/builder:$(BUILD_TAG)
1414

1515
full-clean: check-docker check-registry
1616
docker images -q deis/builder | xargs docker rmi -f

‎cache/Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
include ../includes.mk
22

33
build: check-docker
4-
docker build -t deis/cache:$(GIT_TAG) .
4+
docker build -t deis/cache:$(BUILD_TAG) .
55

66
push: check-docker check-registry check-deisctl
7-
docker tag deis/cache:$(GIT_TAG) $(REGISTRY)/deis/cache:$(GIT_TAG)
8-
docker push $(REGISTRY)/deis/cache:$(GIT_TAG)
9-
deisctl config cache set image=$$DEIS_REGISTRY/deis/cache:$(GIT_TAG)
7+
docker tag deis/cache:$(BUILD_TAG) $(REGISTRY)/deis/cache:$(BUILD_TAG)
8+
docker push $(REGISTRY)/deis/cache:$(BUILD_TAG)
9+
deisctl config cache set image=$(REGISTRY)/deis/cache:$(BUILD_TAG)
1010

1111
clean: check-docker check-registry
12-
docker rmi deis/cache:$(GIT_TAG)
13-
docker rmi $(REGISTRY)/deis/cache:$(GIT_TAG)
12+
docker rmi deis/cache:$(BUILD_TAG)
13+
docker rmi $(REGISTRY)/deis/cache:$(BUILD_TAG)
1414

1515
full-clean: check-docker check-registry
1616
docker images -q deis/cache | xargs docker rmi -f

‎controller/Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ include ../includes.mk
55
all: build run
66

77
build: check-docker
8-
docker build -t deis/controller:$(GIT_TAG) .
8+
docker build -t deis/controller:$(BUILD_TAG) .
99

1010
push: check-docker check-registry check-deisctl
11-
docker tag deis/controller:$(GIT_TAG) $(REGISTRY)/deis/controller:$(GIT_TAG)
12-
docker push $(REGISTRY)/deis/controller:$(GIT_TAG)
13-
deisctl config controller set image=$$DEIS_REGISTRY/deis/controller:$(GIT_TAG)
11+
docker tag deis/controller:$(BUILD_TAG) $(REGISTRY)/deis/controller:$(BUILD_TAG)
12+
docker push $(REGISTRY)/deis/controller:$(BUILD_TAG)
13+
deisctl config controller set image=$(REGISTRY)/deis/controller:$(BUILD_TAG)
1414

1515
clean: check-docker check-registry
16-
docker rmi deis/controller:$(GIT_TAG)
17-
docker rmi $(REGISTRY)/deis/controller:$(GIT_TAG)
16+
docker rmi deis/controller:$(BUILD_TAG)
17+
docker rmi $(REGISTRY)/deis/controller:$(BUILD_TAG)
1818

1919
full-clean: check-docker check-registry
2020
docker images -q deis/controller | xargs docker rmi -f

‎database/Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
include ../includes.mk
22

33
build: check-docker
4-
docker build -t deis/database:$(GIT_TAG) .
4+
docker build -t deis/database:$(BUILD_TAG) .
55

66
push: check-docker check-registry check-deisctl
7-
docker tag deis/database:$(GIT_TAG) $(REGISTRY)/deis/database:$(GIT_TAG)
8-
docker push $(REGISTRY)/deis/database:$(GIT_TAG)
9-
deisctl config database set image=$$DEIS_REGISTRY/deis/database:$(GIT_TAG)
7+
docker tag deis/database:$(BUILD_TAG) $(REGISTRY)/deis/database:$(BUILD_TAG)
8+
docker push $(REGISTRY)/deis/database:$(BUILD_TAG)
9+
deisctl config database set image=$(REGISTRY)/deis/database:$(BUILD_TAG)
1010

1111
clean: check-docker check-registry
12-
docker rmi deis/database:$(GIT_TAG)
13-
docker rmi $(REGISTRY)/deis/database:$(GIT_TAG)
12+
docker rmi deis/database:$(BUILD_TAG)
13+
docker rmi $(REGISTRY)/deis/database:$(BUILD_TAG)
1414

1515
full-clean: check-docker check-registry
1616
docker images -q deis/database | xargs docker rmi -f

‎includes.mk‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
1414
DOCKER_HOST = $(shell echo $$DOCKER_HOST)
1515
REGISTRY = $(shell echo $$DEIS_REGISTRY)
1616
GIT_SHA = $(shell git rev-parse --short HEAD)
17-
GIT_TAG = git-$(GIT_SHA)
17+
ifndef BUILD_TAG
18+
BUILD_TAG = git-$(GIT_SHA)
19+
endif
1820

1921
check-docker:
2022
@if [ -z $$(which docker) ]; then \

‎logger/Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
include ../includes.mk
22

33
build: check-docker
4-
docker build -t deis/logger:$(GIT_TAG) .
4+
docker build -t deis/logger:$(BUILD_TAG) .
55

66
push: check-docker check-registry check-deisctl
7-
docker tag deis/logger:$(GIT_TAG) $(REGISTRY)/deis/logger:$(GIT_TAG)
8-
docker push $(REGISTRY)/deis/logger:$(GIT_TAG)
9-
deisctl config logger set image=$$DEIS_REGISTRY/deis/logger:$(GIT_TAG)
7+
docker tag deis/logger:$(BUILD_TAG) $(REGISTRY)/deis/logger:$(BUILD_TAG)
8+
docker push $(REGISTRY)/deis/logger:$(BUILD_TAG)
9+
deisctl config logger set image=$(REGISTRY)/deis/logger:$(BUILD_TAG)
1010

1111
clean: check-docker check-registry
12-
docker rmi deis/logger:$(GIT_TAG)
13-
docker rmi $(REGISTRY)/deis/logger:$(GIT_TAG)
12+
docker rmi deis/logger:$(BUILD_TAG)
13+
docker rmi $(REGISTRY)/deis/logger:$(BUILD_TAG)
1414

1515
full-clean: check-docker check-registry
1616
docker images -q deis/logger | xargs docker rmi -f

‎registry/Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
include ../includes.mk
22

33
build: check-docker
4-
docker build -t deis/registry:$(GIT_TAG) .
4+
docker build -t deis/registry:$(BUILD_TAG) .
55

66
push: check-docker check-registry check-deisctl
7-
docker tag deis/registry:$(GIT_TAG) $(REGISTRY)/deis/registry:$(GIT_TAG)
8-
docker push $(REGISTRY)/deis/registry:$(GIT_TAG)
9-
deisctl config registry set image=$$DEIS_REGISTRY/deis/registry:$(GIT_TAG)
7+
docker tag deis/registry:$(BUILD_TAG) $(REGISTRY)/deis/registry:$(BUILD_TAG)
8+
docker push $(REGISTRY)/deis/registry:$(BUILD_TAG)
9+
deisctl config registry set image=$(REGISTRY)/deis/registry:$(BUILD_TAG)
1010

1111
clean: check-docker check-registry
12-
docker rmi deis/registry:$(GIT_TAG)
13-
docker rmi $(REGISTRY)/deis/registry:$(GIT_TAG)
12+
docker rmi deis/registry:$(BUILD_TAG)
13+
docker rmi $(REGISTRY)/deis/registry:$(BUILD_TAG)
1414

1515
full-clean: check-docker check-registry
1616
docker images -q deis/registry | xargs docker rmi -f

‎router/Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
include ../includes.mk
22

33
build: check-docker
4-
docker build -t deis/router:$(GIT_TAG) .
4+
docker build -t deis/router:$(BUILD_TAG) .
55

66
push: check-docker check-registry check-deisctl
7-
docker tag deis/router:$(GIT_TAG) $(REGISTRY)/deis/router:$(GIT_TAG)
8-
docker push $(REGISTRY)/deis/router:$(GIT_TAG)
9-
deisctl config router set image=$$DEIS_REGISTRY/deis/router:$(GIT_TAG)
7+
docker tag deis/router:$(BUILD_TAG) $(REGISTRY)/deis/router:$(BUILD_TAG)
8+
docker push $(REGISTRY)/deis/router:$(BUILD_TAG)
9+
deisctl config router set image=$(REGISTRY)/deis/router:$(BUILD_TAG)
1010

1111
clean: check-docker check-registry
12-
docker rmi deis/router:$(GIT_TAG)
13-
docker rmi $(REGISTRY)/deis/router:$(GIT_TAG)
12+
docker rmi deis/router:$(BUILD_TAG)
13+
docker rmi $(REGISTRY)/deis/router:$(BUILD_TAG)
1414

1515
full-clean: check-docker check-registry
1616
docker images -q deis/router | xargs docker rmi -f

0 commit comments

Comments
 (0)