Skip to content
This repository was archived by the owner on Nov 4, 2021. It is now read-only.

Commit e3eb6df

Browse files
committed
Optimized docker setup
1 parent 6caecaf commit e3eb6df

File tree

7 files changed

+86
-222
lines changed

7 files changed

+86
-222
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ services:
44
- docker
55

66
before_script:
7-
- docker-compose -f docker/docker-compose.yml up --build --force-recreate -d
7+
- docker-compose -f docker-compose.yml up --build --force-recreate -d
88
- sh ./travis/connection_check.sh elastic 9200
99
- sh ./travis/connection_check.sh mysql 3306
10+
- sh ./travis/dependencies_check.sh
1011

1112
script:
12-
- docker-compose -f docker/docker-compose.yml exec php /app/driver/vendor/bin/phpunit -c /app/driver/phpunit.xml
13+
- docker-compose -f docker-compose.yml exec php /app/driver/vendor/bin/phpunit -c /app/driver/phpunit.xml

docker-compose.override.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
version: '3'
2+
3+
services:
4+
mysql:
5+
volumes:
6+
- ./docker/mysql/data:/var/lib/mysql
7+
ports:
8+
- 13306:3306
9+
elastic:
10+
volumes:
11+
- ./docker/elastic/data:/usr/share/elasticsearch/data
12+
ports:
13+
- 19200:9200
14+
kibana:
15+
build:
16+
context: docker/kibana
17+
args:
18+
version: 6.2.4
19+
depends_on:
20+
- elastic
21+
environment:
22+
ELASTICSEARCH_URL: http://elastic:9200
23+
ports:
24+
- 15601:5601

docker-compose.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
version: '3'
2+
3+
volumes:
4+
laravel:
5+
6+
services:
7+
driver:
8+
build:
9+
context: .
10+
dockerfile: docker/driver/Dockerfile
11+
volumes:
12+
- ./:/app/driver
13+
laravel:
14+
build:
15+
context: docker/laravel
16+
args:
17+
version: v5.6.*
18+
volumes:
19+
- laravel:/app/laravel
20+
- ./docker/laravel/app/Stubs:/app/laravel/app/Stubs
21+
php:
22+
build:
23+
context: docker/php
24+
args:
25+
version: 7.2
26+
stdin_open: true
27+
tty: true
28+
depends_on:
29+
- driver
30+
- laravel
31+
- mysql
32+
- elastic
33+
volumes:
34+
- ./:/app/driver
35+
- laravel:/app/laravel
36+
- ./docker/laravel/app/Stubs:/app/laravel/app/Stubs
37+
mysql:
38+
build:
39+
context: docker/mysql
40+
args:
41+
version: 5.7
42+
environment:
43+
MYSQL_ROOT_PASSWORD: laravel
44+
MYSQL_DATABASE: laravel
45+
elastic:
46+
build:
47+
context: docker/elastic
48+
args:
49+
version: 6.2.4

docker/console

Lines changed: 0 additions & 131 deletions
This file was deleted.

docker/docker-compose.yml

Lines changed: 0 additions & 88 deletions
This file was deleted.

travis/connection_check.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ host=$1
44
port=$2
55

66
echo "Attempting to connect to $host:$port"
7-
until $(docker-compose -f docker/docker-compose.yml exec php nc -z $host $port); do
7+
until docker-compose -f docker-compose.yml exec php nc -z $host $port; do
88
printf '.'
99
sleep 5
1010
done

travis/dependencies_check.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
3+
echo "Waiting until dependencies are installed"
4+
until docker-compose -f docker-compose.yml exec php find /app/driver/vendor/autoload.php > /dev/null 2>&1; do
5+
printf '.'
6+
sleep 5
7+
done
8+
echo ""
9+
echo "Dependencies are installed"

0 commit comments

Comments
 (0)