diff --git a/Makefile b/Makefile index 11dd838..7cd2c5d 100644 --- a/Makefile +++ b/Makefile @@ -50,12 +50,6 @@ node_modules: dump: @mkdir dump -apps/composer.lock: apps/composer.json - $(DOCKER_EXECPHP) make composer.lock - -apps/vendor: apps/composer.lock - $(DOCKER_EXECPHP) make vendor - apps/.env: apps/.env.dist ## Install .env @cp apps/.env.dist apps/.env @@ -235,15 +229,14 @@ install: folders apps/.env ## installation ifeq ($(COMMAND_ARGS),all) @make node_modules -i @make docker deploy -i - @make apps/vendor -i @make sleep 60 -i @make bdd migrate -i @make assets -i @make encore dev -i - @make linter -i + @make linter all -i else ifeq ($(COMMAND_ARGS),dev) @make install all - @make bdd features -i + @make bdd fixtures -i else @echo "ARGUMENT missing" @echo "---" diff --git a/docker-compose.yml b/docker-compose.yml index 4370cef..91c1f7d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,6 +11,17 @@ volumes: mariadb_data: services: + phpfpmexec: + image: koromerzhin/phpfpm:7.4.12 + command: sh -c "composer install" + volumes: + - ${PWD}/apps:/var/www/ + - ${PWD}/conf/httpd.conf:/usr/local/apache2/conf/httpd.conf + deploy: + restart_policy: + condition: none + labels: + - "traefik.enable=false" redis: image: redis:6.2.0 networks: