Add mysql service

doctrine · Nov 19, 2021 · 094dbb0 · 094dbb0
1 parent 65e36ab
commit 094dbb0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -9,8 +9,21 @@ on:
 jobs:
     test:
         name: 'PHP ${{ matrix.php-version }} ${{ matrix.dependencies }} ${{ matrix.symfony-require }}'
+
         runs-on: ubuntu-20.04
 
+        services:
+            mysql:
+                image: mysql:5.7
+                env:
+                    MYSQL_DATABASE: phpcr_odm_tests
+                    MYSQL_USER: user
+                    MYSQL_PASSWORD: password
+                    MYSQL_ROOT_PASSWORD: rootpassword
+                ports:
+                    - 33306:3306
+                options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
         env:
             SYMFONY_REQUIRE: ${{ matrix.symfony-require }}
 

diff --git a/cli-config.doctrine_dbal.php.dist b/cli-config.doctrine_dbal.php.dist
@@ -12,9 +12,9 @@ $extraCommands[] = new \Jackalope\Tools\Console\Command\InitDoctrineDbalCommand(
 
 $params = array(
     'driver'    => 'pdo_mysql',
-    'host'      => 'localhost',
-    'user'      => 'root',
-    'password'  => '',
+    'host'      => 'mysql',
+    'user'      => 'user',
+    'password'  => 'password',
     'dbname'    => 'phpcr_odm_tests',
 );
 

diff --git a/tests/script_doctrine_dbal.sh b/tests/script_doctrine_dbal.sh
@@ -13,8 +13,6 @@ elif test "${SCRIPT_DIR:0:1}" != "/" ; then
   SCRIPT_DIR="$PWD/$SCRIPT_DIR"
 fi
 
-mysql -e 'create database IF NOT EXISTS phpcr_odm_tests;' -u root
-
 cp ${SCRIPT_DIR}/../cli-config.doctrine_dbal.php.dist ${SCRIPT_DIR}/../cli-config.php
 ${SCRIPT_DIR}/../bin/phpcrodm jackalope:init:dbal --force
 ${SCRIPT_DIR}/../bin/phpcrodm doctrine:phpcr:register-system-node-types