Skip to content

Commit df9a374

Browse files
committed
Watch logs to wait MySQL booting
1 parent f3a0331 commit df9a374

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

.scrutinizer.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@ build:
1919
- curl -L https://github.com/docker/compose/releases/download/1.24.1/docker-compose-`uname -s`-`uname -m` > docker-compose
2020
- chmod +x docker-compose
2121
- sudo mv docker-compose /usr/local/bin
22-
- curl https://bootstrap.pypa.io/get-pip.py | python
23-
- pip install docker-compose-wait
2422
- cp docker-compose-ci.yml docker-compose.yml
2523
- export PHP_VERSION=$(php -r 'preg_match("/^((\d+)[.](\d+))[.](\d+)$/", PHP_VERSION, $m); echo $m[1];')
2624
- docker-compose up -d
25+
- |
26+
sh -c 'docker-compose logs -f mysql | { sed "/mysqld: ready for connections/ q" && kill $$ ;}' || :
2727
- composer install
2828
- mkdir -p build/logs
29-
- docker-compose-wait
3029

3130
tests:
3231
override:

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,18 @@ before_install:
2828
- curl -L https://github.com/docker/compose/releases/download/1.24.1/docker-compose-`uname -s`-`uname -m` > docker-compose
2929
- chmod +x docker-compose
3030
- sudo mv docker-compose /usr/local/bin
31-
- sudo pip install --ignore-installed PyYAML
32-
- sudo pip install docker-compose-wait
3331

3432
before_script:
3533
- cp docker-compose-ci.yml docker-compose.yml
3634
- export PHP_VERSION=$(php -r 'preg_match("/^((\d+)[.](\d+))[.](\d+)$/", PHP_VERSION, $m); echo $m[1];')
3735
- docker-compose up -d
36+
- |
37+
sh -c 'docker-compose logs -f mysql | { sed "/mysqld: ready for connections/ q" && kill $$ ;}' || :
3838
- composer self-update
3939
- composer require "laravel/framework:${LARAVEL_VERSION}" "orchestra/testbench:${TESTBENCH_VERSION}" --no-update
4040
- if [ "$PHPUNIT_VERSION" != "" ]; then composer require "phpunit/phpunit:${PHPUNIT_VERSION}" --no-update; fi;
4141
- composer update
4242
- mkdir -p build/logs
43-
- docker-compose-wait
4443

4544
script:
4645
- docker-compose exec php sh -c 'cd /code; vendor/bin/phpunit'

0 commit comments

Comments
 (0)