Skip to content

Commit

Permalink
Optimized docker setup
Browse files Browse the repository at this point in the history
  • Loading branch information
babenkoivan committed Feb 23, 2019
1 parent 6caecaf commit e3eb6df
Show file tree
Hide file tree
Showing 7 changed files with 86 additions and 222 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ services:
- docker

before_script:
- docker-compose -f docker/docker-compose.yml up --build --force-recreate -d
- docker-compose -f docker-compose.yml up --build --force-recreate -d
- sh ./travis/connection_check.sh elastic 9200
- sh ./travis/connection_check.sh mysql 3306
- sh ./travis/dependencies_check.sh

script:
- docker-compose -f docker/docker-compose.yml exec php /app/driver/vendor/bin/phpunit -c /app/driver/phpunit.xml
- docker-compose -f docker-compose.yml exec php /app/driver/vendor/bin/phpunit -c /app/driver/phpunit.xml
24 changes: 24 additions & 0 deletions docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
version: '3'

services:
mysql:
volumes:
- ./docker/mysql/data:/var/lib/mysql
ports:
- 13306:3306
elastic:
volumes:
- ./docker/elastic/data:/usr/share/elasticsearch/data
ports:
- 19200:9200
kibana:
build:
context: docker/kibana
args:
version: 6.2.4
depends_on:
- elastic
environment:
ELASTICSEARCH_URL: http://elastic:9200
ports:
- 15601:5601
49 changes: 49 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
version: '3'

volumes:
laravel:

services:
driver:
build:
context: .
dockerfile: docker/driver/Dockerfile
volumes:
- ./:/app/driver
laravel:
build:
context: docker/laravel
args:
version: v5.6.*
volumes:
- laravel:/app/laravel
- ./docker/laravel/app/Stubs:/app/laravel/app/Stubs
php:
build:
context: docker/php
args:
version: 7.2
stdin_open: true
tty: true
depends_on:
- driver
- laravel
- mysql
- elastic
volumes:
- ./:/app/driver
- laravel:/app/laravel
- ./docker/laravel/app/Stubs:/app/laravel/app/Stubs
mysql:
build:
context: docker/mysql
args:
version: 5.7
environment:
MYSQL_ROOT_PASSWORD: laravel
MYSQL_DATABASE: laravel
elastic:
build:
context: docker/elastic
args:
version: 6.2.4
131 changes: 0 additions & 131 deletions docker/console

This file was deleted.

88 changes: 0 additions & 88 deletions docker/docker-compose.yml

This file was deleted.

2 changes: 1 addition & 1 deletion travis/connection_check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ host=$1
port=$2

echo "Attempting to connect to $host:$port"
until $(docker-compose -f docker/docker-compose.yml exec php nc -z $host $port); do
until docker-compose -f docker-compose.yml exec php nc -z $host $port; do
printf '.'
sleep 5
done
Expand Down
9 changes: 9 additions & 0 deletions travis/dependencies_check.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/sh

echo "Waiting until dependencies are installed"
until docker-compose -f docker-compose.yml exec php find /app/driver/vendor/autoload.php > /dev/null 2>&1; do
printf '.'
sleep 5
done
echo ""
echo "Dependencies are installed"

0 comments on commit e3eb6df

Please sign in to comment.