Skip to content

Commit 1461b52

Browse files
author
Gabriel Monroy
committed
refactor(makefile): cleanup and add release, dev-release target
1 parent 1f1e4ce commit 1461b52

1 file changed

Lines changed: 21 additions & 14 deletions

File tree

Makefile

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,45 @@ include ../includes.mk
44

55
all: build run
66

7-
build: check-docker
8-
docker build -t deis/controller:$(BUILD_TAG) .
7+
COMPONENT = controller
8+
IMAGE = $(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
9+
DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
910

10-
push: check-docker check-registry check-deisctl
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)
11+
build: check-docker
12+
docker build -t $(IMAGE) .
1413

1514
clean: check-docker check-registry
16-
docker rmi deis/controller:$(BUILD_TAG)
17-
docker rmi $(REGISTRY)/deis/controller:$(BUILD_TAG)
15+
docker rmi $(IMAGE)
1816

1917
full-clean: check-docker check-registry
20-
docker images -q deis/controller | xargs docker rmi -f
21-
docker images -q $(REGISTRY)/deis/controller | xargs docker rmi -f
18+
docker images -q $(IMAGE_PREFIX)$(COMPONENT) | xargs docker rmi -f
2219

2320
install: check-deisctl
24-
deisctl scale controller=1
21+
deisctl scale $(COMPONENT)=1
2522

2623
uninstall: check-deisctl
27-
deisctl scale controller=0
24+
deisctl scale $(COMPONENT)=0
2825

2926
start: check-deisctl
30-
deisctl start controller
27+
deisctl start $(COMPONENT)
3128

3229
stop: check-deisctl
33-
deisctl stop controller
30+
deisctl stop $(COMPONENT)
3431

3532
restart: stop start
3633

3734
run: install start
3835

36+
dev-release: check-registry check-deisctl
37+
docker tag $(IMAGE) $(DEV_IMAGE)
38+
docker push $(DEV_IMAGE)
39+
deisctl config $(COMPONENT) set image=$(DEV_IMAGE)
40+
41+
release:
42+
docker push $(IMAGE)
43+
44+
deploy: build dev-release restart
45+
3946
runserver:
4047
python manage.py runserver
4148

0 commit comments

Comments
 (0)