Skip to content

Commit 1d35fa3

Browse files
committed
feat(docker): first composer install in container
1 parent 14cb2ec commit 1d35fa3

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

Makefile

+2-9
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@ node_modules:
5050
dump:
5151
@mkdir dump
5252

53-
apps/composer.lock: apps/composer.json
54-
$(DOCKER_EXECPHP) make composer.lock
55-
56-
apps/vendor: apps/composer.lock
57-
$(DOCKER_EXECPHP) make vendor
58-
5953
apps/.env: apps/.env.dist ## Install .env
6054
@cp apps/.env.dist apps/.env
6155

@@ -235,15 +229,14 @@ install: folders apps/.env ## installation
235229
ifeq ($(COMMAND_ARGS),all)
236230
@make node_modules -i
237231
@make docker deploy -i
238-
@make apps/vendor -i
239232
@make sleep 60 -i
240233
@make bdd migrate -i
241234
@make assets -i
242235
@make encore dev -i
243-
@make linter -i
236+
@make linter all -i
244237
else ifeq ($(COMMAND_ARGS),dev)
245238
@make install all
246-
@make bdd features -i
239+
@make bdd fixtures -i
247240
else
248241
@echo "ARGUMENT missing"
249242
@echo "---"

docker-compose.yml

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@ volumes:
1111
mariadb_data:
1212

1313
services:
14+
phpfpmexec:
15+
image: koromerzhin/phpfpm:7.4.12
16+
command: sh -c "composer install"
17+
volumes:
18+
- ${PWD}/apps:/var/www/
19+
- ${PWD}/conf/httpd.conf:/usr/local/apache2/conf/httpd.conf
20+
deploy:
21+
restart_policy:
22+
condition: none
23+
labels:
24+
- "traefik.enable=false"
1425
redis:
1526
image: redis:6.2.0
1627
networks:

0 commit comments

Comments
 (0)