Skip to content

Commit 377bf58

Browse files
author
Gabriel Monroy
committed
refactor(makefile): remove fleet, switch to deisctl and custom images
1 parent 466d594 commit 377bf58

1 file changed

Lines changed: 23 additions & 18 deletions

File tree

Makefile

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,37 @@ include ../includes.mk
44

55
all: build run
66

7-
build:
8-
$(call rsync_all)
9-
$(call ssh_all,'cd share/controller && sudo docker build -t deis/controller .')
7+
build: check-docker
8+
docker build -t deis/controller:$(GIT_TAG) .
109

11-
install: check-fleet
12-
$(FLEETCTL) load systemd/*
10+
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)
1314

14-
uninstall: check-fleet stop
15-
$(FLEETCTL) unload systemd/*
16-
$(FLEETCTL) destroy systemd/*
15+
clean: check-docker check-registry
16+
docker rmi deis/controller:$(GIT_TAG)
17+
docker rmi $(REGISTRY)/deis/controller:$(GIT_TAG)
1718

18-
start: check-fleet
19-
$(FLEETCTL) start -no-block systemd/*
19+
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
2022

21-
stop: check-fleet
22-
$(FLEETCTL) stop -block-attempts=600 systemd/*
23+
install: check-deisctl
24+
deisctl scale controller=1
2325

24-
restart: stop start
26+
uninstall: check-deisctl
27+
deisctl scale controller=0
2528

26-
run: install start
29+
start: check-deisctl
30+
deisctl start controller
2731

28-
clean: uninstall
29-
$(call ssh_all,'sudo docker rm -f deis-controller')
32+
stop: check-deisctl
33+
deisctl stop controller
3034

31-
full-clean: clean
32-
$(call ssh_all,'sudo docker rmi deis/controller')
35+
restart: stop start
36+
37+
run: install start
3338

3439
runserver:
3540
python manage.py runserver

0 commit comments

Comments
 (0)