Merge pull request #161 from MedicalMundi/mariadb-upgrade

Upgrade mariadb to v10.2.20.
MedicalMundi · Feb 27, 2025 · 1040b14 · 1040b14
2 parents c6a36ec + 352b98a
commit 1040b14
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/.env b/.env
@@ -27,7 +27,7 @@ APP_SECRET=977ce21a184de9796cc4c700fa3fe29c
 # DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=8.0.32&charset=utf8mb4"
 # DATABASE_URL="postgresql://app:[email protected]:5432/app?serverVersion=15&charset=utf8"
 
-DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=10.6.16-MariaDB&charset=utf8mb4"
+DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=10.6.20-MariaDB&charset=utf8mb4"
 ###< doctrine/doctrine-bundle ###
 
 ###> prooph/pdo-event-store ###

diff --git a/.github/workflows/acceptance-stage.yaml b/.github/workflows/acceptance-stage.yaml
@@ -20,7 +20,7 @@ jobs:
     timeout-minutes: 10
     services:
       mysql:
-        image: mariadb:10.6.16
+        image: mariadb:10.6.20
         env:
           MYSQL_ROOT_PASSWORD: test
           MYSQL_USER: test
@@ -92,24 +92,24 @@ jobs:
         if: ${{ github.ref_name == 'main' }}
         run: ./bin/console doctrine:migrations:migrate -e test -n -vv --allow-no-migration --ansi
         env:
-          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4
+          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.20-MariaDB&charset=utf8mb4
 
       - name: Show database migrations list
         if: ${{ github.ref_name == 'main' }}
         run: ./bin/console doctrine:migrations:list -e test --ansi
         env:
-          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4
+          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.20-MariaDB&charset=utf8mb4
 
       - name: Run database schema update
         if: ${{ github.ref_name != 'main' }}
         run: ./bin/console doctrine:schema:update -e test --force --ansi
         env:
-          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4
+          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.20-MariaDB&charset=utf8mb4
 
       - name: Run database schema validate
         run: ./bin/console doctrine:schema:validate -e test --ansi
         env:
-          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4
+          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.20-MariaDB&charset=utf8mb4
 
 
   integration-test:
@@ -118,7 +118,7 @@ jobs:
     timeout-minutes: 10
     services:
       mysql:
-        image: mariadb:10.6.16
+        image: mariadb:10.6.20
         env:
           MYSQL_ROOT_PASSWORD: test
           MYSQL_USER: test
@@ -190,23 +190,23 @@ jobs:
         if: ${{ github.ref_name == 'main' }}
         run: ./bin/console doctrine:migrations:migrate -e test -n -vv --allow-no-migration --ansi
         env:
-          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4
+          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.20-MariaDB&charset=utf8mb4
 
       - name: Run database schema update
         if: ${{ github.ref_name != 'main' }}
         run: ./bin/console doctrine:schema:update -e test --force --ansi
         env:
-          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4
+          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.20-MariaDB&charset=utf8mb4
 
       - name: Run database schema validate
         run: ./bin/console doctrine:schema:validate -e test --ansi
         env:
-          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4
+          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.20-MariaDB&charset=utf8mb4
 
       - name: Run integration testsuite
         run: ./bin/phpunit --testsuite integration --colors=always
         env:
-          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4
+          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.20-MariaDB&charset=utf8mb4
 
 
   functional-test:
@@ -287,20 +287,20 @@ jobs:
         if: ${{ github.ref_name == 'main' }}
         run: ./bin/console doctrine:migrations:migrate -e test -n -vv --allow-no-migration --ansi
         env:
-          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4
+          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.20-MariaDB&charset=utf8mb4
 
       - name: Run database schema update
         if: ${{ github.ref_name != 'main' }}
         run: ./bin/console doctrine:schema:update -e test --force --ansi
         env:
-          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4
+          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.20-MariaDB&charset=utf8mb4
 
       - name: Run database schema validate
         run: ./bin/console doctrine:schema:validate -e test --ansi
         env:
-          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4
+          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.20-MariaDB&charset=utf8mb4
 
       - name: Run functional testsuite
         run: ./bin/phpunit --testsuite functional --colors=always
         env:
-          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4
+          DATABASE_URL: mysql://test:[email protected]:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.20-MariaDB&charset=utf8mb4
diff --git a/compose.yaml b/compose.yaml
@@ -7,7 +7,7 @@ services:
       MERCURE_PUBLISHER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET:-!ChangeThisMercureHubJWTSecretKey!}
       MERCURE_SUBSCRIBER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET:-!ChangeThisMercureHubJWTSecretKey!}
       # Run "composer require symfony/orm-pack" to install and configure Doctrine ORM
-      DATABASE_URL: mysql://${MARIADB_USER:-marketplace_accounts_user}:${MARIADB_PASSWORD:-marketplace_accounts_pwd}@mysql:3306/${MARIADB_DB:-marketplace-accounts-db}?serverVersion=10.6.14-MariaDB&charset=utf8mb4
+      DATABASE_URL: mysql://${MARIADB_USER:-marketplace_accounts_user}:${MARIADB_PASSWORD:-marketplace_accounts_pwd}@mysql:3306/${MARIADB_DB:-marketplace-accounts-db}?serverVersion=10.6.20-MariaDB&charset=utf8mb4
       # Run "composer require symfony/mercure-bundle" to install and configure the Mercure integration
       MERCURE_URL: ${CADDY_MERCURE_URL:-http://php/.well-known/mercure}
       MERCURE_PUBLIC_URL: ${CADDY_MERCURE_PUBLIC_URL:-https://${SERVER_NAME:-localhost}/.well-known/mercure}
@@ -35,7 +35,7 @@ services:
 
 ###> doctrine/doctrine-bundle ###
   mysql:
-    image: mariadb:${MARIADB_VERSION:-10.6.16}
+    image: mariadb:${MARIADB_VERSION:-10.6.20}
     container_name: mysql
     environment:
       MYSQL_ROOT_PASSWORD: 'marketplace'

diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml
@@ -4,7 +4,7 @@ doctrine:
 
         # IMPORTANT: You MUST configure your server version,
         # either here or in the DATABASE_URL env var (see .env file)
-        server_version: '10.6.16-MariaDB'
+        server_version: '10.6.20-MariaDB'
         charset: 'utf8mb4'
 
         profiling_collect_backtrace: '%kernel.debug%'