File tree Expand file tree Collapse file tree 1 file changed +8
-9
lines changed Expand file tree Collapse file tree 1 file changed +8
-9
lines changed Original file line number Diff line number Diff line change 11SHELL = /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
4544start_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
5049start_vue :
5150 $(DOCKER_EXEC_VUE ) make
@@ -61,7 +60,7 @@ reload_www:
6160
6261deploy_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
You can’t perform that action at this time.
0 commit comments