From 2ad084487a6398bf9ac3619ca9b671850930ff59 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Tue, 14 Jan 2025 14:56:27 +0100 Subject: [PATCH] tec: Require MariaDB >= 10.5 --- .env | 2 +- .github/workflows/tests.yml | 6 +++--- CHANGELOG.md | 1 + README.md | 2 +- docker/development/docker-compose.yml | 2 +- docs/administrators/deploy.md | 2 +- env.sample | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.env b/.env index 6f924d48..0f827d53 100644 --- a/.env +++ b/.env @@ -7,7 +7,7 @@ APP_SECRET=97cb420d0d43c4c786c51225db0b6018 APP_BASE_URL=http://localhost:8000 DATABASE_URL="postgresql://postgres:postgres@pgsql:5432/bileto?serverVersion=13&charset=utf8" -# DATABASE_URL="mysql://root:mariadb@mariadb:3306/bileto?serverVersion=10.4.29-MariaDB" +# DATABASE_URL="mysql://root:mariadb@mariadb:3306/bileto?serverVersion=10.5.27-MariaDB" MAILER_DSN=smtp://support%40example.com:secret@mailserver:3025 MAILER_FROM=support@example.com diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 901bdf82..1135a120 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -78,7 +78,7 @@ jobs: services: mariadb: - image: mariadb:10.4 + image: mariadb:10.5 ports: - 3306:3306 env: @@ -90,7 +90,7 @@ jobs: --health-timeout=5s --health-retries=5 - name: Tests over MariaDB 10.4 + name: Tests over MariaDB steps: - uses: actions/checkout@v3 @@ -116,4 +116,4 @@ jobs: - name: Run the test suite run: make test env: - DATABASE_URL: 'mysql://root:mariadb@127.0.0.1:3306/bileto_test?serverVersion=10.4.29-MariaDB' + DATABASE_URL: 'mysql://root:mariadb@127.0.0.1:3306/bileto_test?serverVersion=10.5.27-MariaDB' diff --git a/CHANGELOG.md b/CHANGELOG.md index 89e2bb70..d915b626 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Breaking changes PostgreSQL 13+ is now required as [PostgreSQL 12 is no longer supported.](https://www.postgresql.org/support/versioning/) +MariaDB 10.5+ is now required as [MariaDB 10.4 is no longer supported.](https://mariadb.org/about/#maintenance-policy) ## 2024-12-12 - 0.13.0 diff --git a/README.md b/README.md index e3ac0754..c4519e6a 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ It allows you to: ![Screenshot of the tickets page of Bileto showing 3 opened tickets and a search form.](public/screenshot.webp) It is written with [Symfony](https://symfony.com/) and works with [PHP](https://www.php.net/) 8.2 or 8.3. -The supported databases are PostgreSQL >= 13 and MariaDB >= 10.4. +The supported databases are PostgreSQL >= 13 and MariaDB >= 10.5. It is developed by [Probesys](https://probesys.coop) as a community project. diff --git a/docker/development/docker-compose.yml b/docker/development/docker-compose.yml index f494ff98..9753d45b 100644 --- a/docker/development/docker-compose.yml +++ b/docker/development/docker-compose.yml @@ -59,7 +59,7 @@ services: - pgsql mariadb: - image: mariadb:10.4 + image: mariadb:10.5 restart: unless-stopped environment: MARIADB_ROOT_PASSWORD: mariadb diff --git a/docs/administrators/deploy.md b/docs/administrators/deploy.md index 2ba560d7..1731faf9 100644 --- a/docs/administrators/deploy.md +++ b/docs/administrators/deploy.md @@ -33,7 +33,7 @@ $ psql --version psql (PostgreSQL) 14.3 ``` -Or if you use MariaDB (must be >= 10.4): +Or if you use MariaDB (must be >= 10.5): ```console $ mariadb --version diff --git a/env.sample b/env.sample index 607e7bfc..95e5a78d 100644 --- a/env.sample +++ b/env.sample @@ -33,7 +33,7 @@ APP_BASE_URL=https://example.org # Uncomment one of the two following line (depending on your database) and # adapt the credentials and the serverVersion. # DATABASE_URL="postgresql://user:password@localhost:5432/bileto_production?serverVersion=13&charset=utf8" -# DATABASE_URL="mysql://user:password@localhost:3306/bileto_production?serverVersion=10.4.29-MariaDB" +# DATABASE_URL="mysql://user:password@localhost:3306/bileto_production?serverVersion=10.5.27-MariaDB" ######################################## # Configuration of the SMTP mailserver #