From 352b98ad72dfe13686a2c0554dfb0b34b0e65540 Mon Sep 17 00:00:00 2001 From: zerai Date: Thu, 27 Feb 2025 14:08:01 +0100 Subject: [PATCH] Upgrade mariadb to v10.2.20. --- .env | 2 +- .github/workflows/acceptance-stage.yaml | 28 ++++++++++++------------- compose.yaml | 4 ++-- config/packages/doctrine.yaml | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.env b/.env index ce87f2e..1700804 100644 --- a/.env +++ b/.env @@ -27,7 +27,7 @@ APP_SECRET=977ce21a184de9796cc4c700fa3fe29c # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8.0.32&charset=utf8mb4" # DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=15&charset=utf8" -DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=10.6.16-MariaDB&charset=utf8mb4" +DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1: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 index 1289c71..a3c79c5 100644 --- 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:test@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4 + DATABASE_URL: mysql://test:test@127.0.0.1:${{ 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:test@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4 + DATABASE_URL: mysql://test:test@127.0.0.1:${{ 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:test@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4 + DATABASE_URL: mysql://test:test@127.0.0.1:${{ 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:test@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4 + DATABASE_URL: mysql://test:test@127.0.0.1:${{ 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:test@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4 + DATABASE_URL: mysql://test:test@127.0.0.1:${{ 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:test@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4 + DATABASE_URL: mysql://test:test@127.0.0.1:${{ 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:test@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4 + DATABASE_URL: mysql://test:test@127.0.0.1:${{ 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:test@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4 + DATABASE_URL: mysql://test:test@127.0.0.1:${{ 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:test@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4 + DATABASE_URL: mysql://test:test@127.0.0.1:${{ 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:test@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4 + DATABASE_URL: mysql://test:test@127.0.0.1:${{ 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:test@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4 + DATABASE_URL: mysql://test:test@127.0.0.1:${{ 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:test@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.14-MariaDB&charset=utf8mb4 + DATABASE_URL: mysql://test:test@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/symfony?serverVersion=10.6.20-MariaDB&charset=utf8mb4 diff --git a/compose.yaml b/compose.yaml index 1fe4d58..cd55aab 100644 --- 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 index 8a4fe21..b33138c 100644 --- 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%'