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

Commit f11557f

Browse files
committed
Rebuilt docker environment and pipeline
1 parent f078a6f commit f11557f

25 files changed

+36
-489
lines changed

.travis.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
1-
sudo: required
1+
sudo: false
22

3-
services:
4-
- docker
3+
cache:
4+
directories:
5+
- $HOME/.composer/cache
6+
7+
language: php
8+
9+
php:
10+
- 7.3
11+
- 7.2
12+
- 7.1
13+
- 7.0
514

615
before_script:
7-
- docker-compose -f docker-compose.yml up --build --force-recreate -d
8-
- sh ./travis/connection_check.sh elastic 9200
9-
- sh ./travis/connection_check.sh mysql 3306
10-
- sh ./travis/dependencies_check.sh
16+
- composer global require --no-interaction --prefer-dist --update-no-dev hirak/prestissimo
17+
- composer install --no-interaction --prefer-dist
1118

1219
script:
13-
- docker-compose -f docker-compose.yml exec php /app/driver/vendor/bin/phpunit -c /app/driver/phpunit.xml.dist
20+
- vendor/bin/phpunit --colors=always

docker-compose.override.yml

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

docker-compose.yml

Lines changed: 21 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,30 @@
1-
version: '3'
2-
3-
volumes:
4-
laravel:
1+
version: '3.7'
52

63
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
214
php:
22-
build:
23-
context: docker/php
24-
args:
25-
version: 7.2
26-
stdin_open: true
27-
tty: true
5+
image: babenkoivan/scout-elasticsearch-driver-php-cli:1.0.1
6+
command: >
7+
sh -c 'check-connection mysql 3306 &&
8+
check-connection elastic 9200 &&
9+
php artisan migrate --no-interaction --seed &&
10+
php -a'
11+
volumes:
12+
- .:/app/vendor/babenkoivan/scout-elasticsearch-driver
2813
depends_on:
29-
- driver
30-
- laravel
3114
- mysql
3215
- elastic
33-
volumes:
34-
- ./:/app/driver
35-
- laravel:/app/laravel
36-
- ./docker/laravel/app/Stubs:/app/laravel/app/Stubs
16+
stdin_open: true
17+
environment:
18+
DB_HOST: mysql
19+
DB_DATABASE: app
20+
DB_USERNAME: root
21+
DB_PASSWORD: root
22+
SCOUT_DRIVER: elastic
23+
SCOUT_ELASTIC_HOST: elastic:9200
3724
mysql:
38-
build:
39-
context: docker/mysql
40-
args:
41-
version: 5.7
25+
image: mysql:5.7
4226
environment:
43-
MYSQL_ROOT_PASSWORD: laravel
44-
MYSQL_DATABASE: laravel
27+
MYSQL_ROOT_PASSWORD: root
28+
MYSQL_DATABASE: app
4529
elastic:
46-
build:
47-
context: docker/elastic
48-
args:
49-
version: 6.2.4
30+
image: docker.elastic.co/elasticsearch/elasticsearch:6.2.4

docker/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

docker/driver/Dockerfile

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

docker/driver/bootstrap

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

docker/elastic/Dockerfile

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

docker/elastic/data/.gitkeep

Whitespace-only changes.

docker/kibana/Dockerfile

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

docker/laravel/.env

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

0 commit comments

Comments
 (0)