Merge pull request #1855 from MasterOdin/docker_compose

Update docker-compose/phpunit mysql and postgres to match DSN values
cakephp · Aug 14, 2020 · e49269e · e49269e
2 parents 8df12e6 + a8b9a43
commit e49269e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -14,14 +14,15 @@ services:
     mysql:
         image: mysql:5.6
         environment:
-            - MYSQL_DATABASE=phinx_testing
-            - MYSQL_ALLOW_EMPTY_PASSWORD=yes
+            - MYSQL_DATABASE=phinx
+            - MYSQL_ROOT_PASSWORD=root
         ports:
             - 3306:3306
 
     postgres:
         image: postgres:9.4
         environment:
-            - POSTGRES_DB=phinx_testing
+            - POSTGRES_DB=phinx
+            - POSTGRES_PASSWORD=postgres
         ports:
             - 5432:5432
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -19,10 +19,10 @@
         <env name="SQLSRV_DSN" value="sqlsrv://user:pass@localhost/test"/>
         -->
         <!-- MySQL
-        <env name="MYSQL_DSN" value="mysql://root@127.0.0.1/test"/>
+        <env name="MYSQL_DSN" value="mysql://root:root@127.0.0.1/phinx"/>
         -->
         <!-- PostgreSQL
-        <env name="PGSQL_DSN" value="pgsql://postgres@127.0.0.1/test"/>
+        <env name="PGSQL_DSN" value="pgsql://postgres:postgres@127.0.0.1/phinx"/>
         -->
         <!-- SQLite
         <env name="SQLITE_DSN" value="sqlite:///:memory:"/>