Commit 389eb989 authored by Smolevich's avatar Smolevich

Update config

parent f08f4e98
...@@ -20,7 +20,7 @@ jobs: ...@@ -20,7 +20,7 @@ jobs:
mysql: mysql:
image: mysql:5.7 image: mysql:5.7
ports: ports:
- 3306:3306 - 3307:3306
env: env:
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes' MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
MYSQL_DATABASE: 'unittest' MYSQL_DATABASE: 'unittest'
...@@ -52,6 +52,7 @@ jobs: ...@@ -52,6 +52,7 @@ jobs:
env: env:
MONGO_HOST: 0.0.0.0 MONGO_HOST: 0.0.0.0
MYSQL_HOST: 0.0.0.0 MYSQL_HOST: 0.0.0.0
MYSQL_PORT: 3307
- name: Send coveralls - name: Send coveralls
run: | run: |
ls -alt ls -alt
......
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
<env name="MONGO_DATABASE" value="unittest"/> <env name="MONGO_DATABASE" value="unittest"/>
<env name="MONGO_PORT" value="27017"/> <env name="MONGO_PORT" value="27017"/>
<env name="MYSQL_HOST" value="mysql"/> <env name="MYSQL_HOST" value="mysql"/>
<env name="MYSQL_PORT" value="3306"/>
<env name="MYSQL_DATABASE" value="unittest"/> <env name="MYSQL_DATABASE" value="unittest"/>
<env name="MYSQL_USERNAME" value="root"/> <env name="MYSQL_USERNAME" value="root"/>
<env name="QUEUE_CONNECTION" value="database"/> <env name="QUEUE_CONNECTION" value="database"/>
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
$mongoHost = env('MONGO_HOST', 'mongodb'); $mongoHost = env('MONGO_HOST', 'mongodb');
$mongoPort = env('MONGO_PORT') ? (int) env('MONGO_PORT') : 27017; $mongoPort = env('MONGO_PORT') ? (int) env('MONGO_PORT') : 27017;
$mysqlPort = env('MYSQL_PORT') ? (int) env('MYSQL_PORT') : 3306;
return [ return [
...@@ -23,6 +24,7 @@ return [ ...@@ -23,6 +24,7 @@ return [
'mysql' => [ 'mysql' => [
'driver' => 'mysql', 'driver' => 'mysql',
'host' => env('MYSQL_HOST', 'mysql'), 'host' => env('MYSQL_HOST', 'mysql'),
'port' => $mysqlPort,
'database' => env('MYSQL_DATABASE', 'unittest'), 'database' => env('MYSQL_DATABASE', 'unittest'),
'username' => env('MYSQL_USERNAME', 'root'), 'username' => env('MYSQL_USERNAME', 'root'),
'password' => env('MYSQL_PASSWORD', ''), 'password' => env('MYSQL_PASSWORD', ''),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment