Skip to content

Commit dcd000e

Browse files
yvessYves Serrano
authored andcommitted
fix notty run of 'make update'
1 parent 55cb7f4 commit dcd000e

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

Makefile

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
SHELL = /bin/bash
2-
DOCKER_EXEC_DJANGO=$(shell command -v docker > /dev/null && echo "docker-compose exec django")
3-
DOCKER_EXEC_VUE=$(shell command -v docker > /dev/null && echo "docker-compose exec vue")
4-
DOCKER_EXEC_WWW=$(shell command -v docker > /dev/null && echo "docker-compose exec www")
5-
DOCKER_CRON_VUE=$(shell command -v docker > /dev/null && echo "docker-compose exec -T vue")
6-
DOCKER_CRON_DJANGO=$(shell command -v docker > /dev/null && echo "docker-compose exec -T django")
2+
NOTTY=$(shell command [ "$$DOCKER_NOTTY" = YES ] && echo "-T")
3+
DOCKER_EXEC_DJANGO=$(shell command -v docker > /dev/null && echo "docker-compose exec $(NOTTY) django")
4+
DOCKER_EXEC_VUE=$(shell command -v docker > /dev/null && echo "docker-compose exec $(NOTTY) vue")
5+
DOCKER_EXEC_WWW=$(shell command -v docker > /dev/null && echo "docker-compose exec $(NOTTY) www")
76

87

98
.PHONY: tests
@@ -43,9 +42,9 @@ enter_www:
4342
$(DOCKER_EXEC_WWW) bash
4443

4544
start_all: up
46-
$(DOCKER_CRON_VUE) make &
47-
$(DOCKER_CRON_DJANGO) make &
48-
$(DOCKER_CRON_VUE) make screenshotservice &
45+
$(DOCKER_VUE) $(NOTTY) make &
46+
$(DOCKER_DJANGO) $(NOTTY) make &
47+
$(DOCKER_VUE) make screenshotservice &
4948

5049
start_vue:
5150
$(DOCKER_EXEC_VUE) make
@@ -61,7 +60,7 @@ reload_www:
6160

6261
deploy_local:
6362
docker-compose up -d
64-
NOTTY=YES make -f vue/Makefile build
63+
DOCKER_NOTTY=YES make -f vue/Makefile build
6564
docker-compose exec -T vue rsync -av --delete dist/ /var/services/django/static/dist/
6665
docker-compose exec -T django make migrate
6766
docker-compose exec -T django killall -TERM gunicorn

0 commit comments

Comments
 (0)