Skip to content

Commit

Permalink
feat(docker): first composer install in container
Browse files Browse the repository at this point in the history
  • Loading branch information
koromerzhin committed Feb 25, 2021
1 parent 14cb2ec commit 1d35fa3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
11 changes: 2 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 "---"
Expand Down
11 changes: 11 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 1d35fa3

Please sign in to comment.