Skip to content

Commit 3085dcb

Browse files
committed
More compose changes
1 parent 3c0c461 commit 3085dcb

2 files changed

Lines changed: 32 additions & 19 deletions

File tree

Makefile

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,20 @@ build: ./php/Dockerfile composer.json composer.lock
22
docker-compose build lyngvi
33

44
in:
5-
docker-compose exec lyngvi sh
5+
docker-compose run sh
66

7-
up: build
8-
docker-compose up
7+
up: build commands
8+
docker-compose up lyngvi
9+
10+
detached: build install commands
11+
docker-compose up lyngvi -d
912

1013
commands: _register-commands.php
11-
docker-compose exec lyngvi php ./_register-commands.php
14+
docker-compose up commands
1215

1316
deploy:
1417
docker-compose down
15-
make build
16-
docker-compose up -d
17-
make commands
18-
19-
cs:
20-
composer cs
21-
22-
csf:
23-
composer csf
24-
25-
test:
26-
composer test
18+
make detached
2719

28-
test-coverage:
29-
composer test-coverage
20+
install:
21+
docker-compose up install

docker-compose.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,27 @@ services:
66
working_dir: /lyngvi
77
restart: always
88

9+
install:
10+
build: ./php
11+
volumes:
12+
- .:/lyngvi
13+
working_dir: /lyngvi
14+
command: /composer.phar install
15+
16+
commands:
17+
build: ./php
18+
volumes:
19+
- .:/lyngvi
20+
working_dir: /lyngvi
21+
command: php _register-commands.php
22+
23+
sh:
24+
build: ./php
25+
volumes:
26+
- .:/lyngvi
27+
working_dir: /lyngvi
28+
command: sh
29+
930
volumes:
1031
lyngvi:
11-
driver: local
32+
driver: local

0 commit comments

Comments
 (0)