Skip to content

Commit 721035f

Browse files
Gabriel MonroyMatthew Fisher
authored andcommitted
refactor(makefile): dispatch to relevant coreos utilities
chore(makefile): stop on uninstall chore(makefile): separate clean and full-clean chore(makefile): separate clean and full-clean perf(makefile): batch ssh calls in root makefile fix(Makefile): run make cmds on vagrant in order to be consistent, all commands should be run under vagrant.
1 parent 3a29d8c commit 721035f

1 file changed

Lines changed: 28 additions & 8 deletions

File tree

Makefile

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,35 @@
1+
.PHONY: all test logs
2+
3+
all: build run
4+
15
build:
2-
docker build -t deis/controller .
6+
vagrant ssh -c 'cd share/controller && sudo docker build -t deis/controller .'
7+
8+
install:
9+
vagrant ssh -c 'sudo systemctl enable /home/core/share/controller/systemd/*'
10+
11+
uninstall: stop
12+
vagrant ssh -c 'sudo systemctl disable /home/core/share/controller/systemd/*'
13+
14+
start:
15+
vagrant ssh -c 'sudo systemctl start deis-controller.service'
16+
17+
stop:
18+
vagrant ssh -c 'sudo systemctl stop deis-controller.service'
19+
20+
restart:
21+
vagrant ssh -c 'sudo systemctl restart deis-controller.service'
22+
23+
logs:
24+
vagrant ssh -c 'sudo journalctl -f -u deis-controller.service'
325

4-
run:
5-
docker run -p $${PORT:-8000}:$${PORT:-8000} -e ETCD=$${ETCD:-127.0.0.1:4001} -name deis-controller deis/controller
6-
exit 0
26+
run: install restart logs
727

8-
shell:
9-
docker run -t -i -e ETCD=$${ETCD:-127.0.0.1:4001} deis/controller /bin/bash
28+
clean: uninstall
29+
vagrant ssh -c 'sudo docker rm -f deis-controller'
1030

11-
clean:
12-
-docker rmi deis/controller
31+
full-clean: clean
32+
vagrant ssh -c 'sudo docker rmi deis/controller'
1333

1434
test:
1535
python manage.py test --noinput api web

0 commit comments

Comments
 (0)