From 1c1e9c20a3e1ec49f2303c61704b5c997afffa16 Mon Sep 17 00:00:00 2001 From: Chingis S Date: Mon, 5 Oct 2026 22:18:11 +0700 Subject: [PATCH 1/2] Add MariaDB 12.3 LTS support Add the MariaDB 12.3 LTS image option and document available versions. Keep MariaDB 11.8 as the default; the new option requires publication of the first 12.3 revision. --- .env | 1 + README.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.env b/.env index 1e4eff494..52321a4b1 100644 --- a/.env +++ b/.env @@ -33,6 +33,7 @@ FS_METHOD=direct ### --- MARIADB ---- MARIADB_TAG=11.8-r3 +#MARIADB_TAG=12.3-r4 #MARIADB_TAG=11.4-r3 #MARIADB_TAG=10.11-r3 #MARIADB_TAG=10.6-r3 diff --git a/README.md b/README.md index 03be9dd6f..2fa9d0e83 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The WordPress stack consists of the following containers: | [WordPress] | 7 | [wodby/wordpress] | ✓ | | [PHP] | 8.5, 8.4, 8.3, 8.2 | [wodby/wordpress-php] | | | Crond | | [wodby/wordpress-php] | ✓ | -| [MariaDB] | 11.4, 10.6, 10.5, 10.4 | [wodby/mariadb] | ✓ | +| [MariaDB] | 12.3, 11.8, 11.4, 10.11, 10.6 | [wodby/mariadb] | ✓ | | [Valkey] | 9.0, 8.1, 8.0, 7 | [wodby/valkey] | | | [Redis] | 8.6, 8.4, 8.2, 7.4 | [wodby/redis] | | | [Memcached] | 1 | [wodby/memcached] | | From 7e2d531343ff339cb81342c3b5abe6fa3a3026f7 Mon Sep 17 00:00:00 2001 From: Chingis S Date: Tue, 6 Oct 2026 02:16:42 +0700 Subject: [PATCH 2/2] Use published MariaDB r4 images Update supported MariaDB image series to revision r4 while retaining 11.8 as the default. Exercise MariaDB 12.3 in the existing database-backed application tests where available. --- .env | 8 ++++---- .github/workflows/workflow.yml | 8 +++++++- tests/.env | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.env b/.env index 52321a4b1..72bc9e544 100644 --- a/.env +++ b/.env @@ -32,11 +32,11 @@ FS_METHOD=direct ### --- MARIADB ---- -MARIADB_TAG=11.8-r3 +MARIADB_TAG=11.8-r4 #MARIADB_TAG=12.3-r4 -#MARIADB_TAG=11.4-r3 -#MARIADB_TAG=10.11-r3 -#MARIADB_TAG=10.6-r3 +#MARIADB_TAG=11.4-r4 +#MARIADB_TAG=10.11-r4 +#MARIADB_TAG=10.6-r4 ### --- VANILLA WORDPRESS ---- diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index b4cb70a6d..e814942b4 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -22,10 +22,16 @@ jobs: env: PHP_VER: ${{ matrix.php_ver }} run: make test + test-mariadb-12-3: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v6 + - name: Test MariaDB 12.3 LTS + run: make test MARIADB_TAG=12.3-r4 release: runs-on: ubuntu-latest if: startsWith(github.ref, 'refs/tags/') - needs: test + needs: [test, test-mariadb-12-3] steps: - uses: actions/checkout@v6 - name: prepare artifact diff --git a/tests/.env b/tests/.env index a5f83481b..35c9b20b4 100644 --- a/tests/.env +++ b/tests/.env @@ -6,7 +6,7 @@ DB_PASSWORD=wordpress DB_ROOT_PASSWORD=password DB_HOST=mariadb -MARIADB_TAG=11.8-r3 +MARIADB_TAG=11.8-r4 NGINX_TAG=1.31-r3 VALKEY_TAG=9.0-r0 VINYL_TAG=9.1-r4