H-O-O-T-S/Open-RSC-Docker-Home
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use docker-compose instead of docker for exec

Browse Source
This commit is contained in:
Vincent Letourneau
2017-08-08 10:15:36 +02:00
parent dba3a26d58
commit 1cdf44654d
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@@ -26,7 +26,7 @@ init:
@$(shell cp -n $(shell pwd)/web/app/composer.json.dist $(shell pwd)/web/app/composer.json 2> /dev/null) @$(shell cp -n $(shell pwd)/web/app/composer.json.dist $(shell pwd)/web/app/composer.json 2> /dev/null)
apidoc: apidoc:
@docker exec $(shell docker-compose ps -q php) app/vendor/bin/apigen generate app/src --destination app/doc @docker-compose exec php ./app/vendor/bin/apigen generate app/src --destination app/doc
@make resetOwner @make resetOwner
clean: clean:
@@ -40,19 +40,16 @@ clean:
code-sniff: code-sniff:
@echo "Checking the standard code..." @echo "Checking the standard code..."
@docker exec $(shell docker-compose ps -q php) app/vendor/bin/phpcs --standard=PSR2 app/src @docker-compose exec php app/vendor/bin/phpcs --standard=PSR2 app/src
composer-up: composer-up:
@docker run --rm -v $(shell pwd)/web/app:/app composer update @docker run --rm -v $(shell pwd)/web/app:/app composer update
docker-start: init docker-start: init
@echo "Docker is running..."
docker-compose up -d docker-compose up -d
docker-stop: docker-stop:
@docker-compose stop @docker-compose down -v
@docker-compose kill
@docker-compose rm -f
@make clean @make clean
gen-certs: gen-certs: