From bee7207de72f3546b58aab1063d168451d6d7d39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Bouc=CC=8Cek?= Date: Fri, 31 Jul 2026 11:39:52 +0200 Subject: [PATCH] mariadb: Update versions Remove 12.2 (discontinued upstream), promote 12.3 to stable (new LTS, takes over the 12, latest and lts tags), add 13.0 RC. Fix RC tag format examples in README. Co-Authored-By: Claude Fable 5 --- README.md | 16 ++++---- build-mariadb.sh | 44 +++++++++++----------- check-pulls.sh | 4 +- mysql/Dockerfile-12.3 | 4 +- mysql/{Dockerfile-12.2 => Dockerfile-13.0} | 4 +- 5 files changed, 36 insertions(+), 36 deletions(-) rename mysql/{Dockerfile-12.2 => Dockerfile-13.0} (90%) diff --git a/README.md b/README.md index f002707..1578478 100644 --- a/README.md +++ b/README.md @@ -52,9 +52,9 @@ of base images designed to cover most standard development workflows — with no - current **PHP** versions: 8.5, 8.4, 8.3 and 8.2 - unsupported **PHP** versions also available: 8.1, 8.0, 7.4, 7.3, 7.2, 7.1, 7.0, 5.6, 5.5 and 5.4 (with limited stability, unoptimized, unmaintained) -- current versions of **MariaDB** 12.2, 11.8, 11.4, 10.11, 10.6 and RC pre-release of 12.3 -- unsupported versions of **MariaDB** 12.1, 12.0, 11.7, 11.6, 11.5, 11.3, 11.2, 11.1, 11.0, 10.10, 10.9, 10.8, 10.7, 10.5, - 10.4 and 10.3 (unmaintained) +- current versions of **MariaDB** 12.3, 11.8, 11.4, 10.11, 10.6 and RC pre-release of 13.0 +- unsupported versions of **MariaDB** 12.2, 12.1, 12.0, 11.7, 11.6, 11.5, 11.3, 11.2, 11.1, 11.0, 10.10, 10.9, 10.8, 10.7, + 10.5, 10.4 and 10.3 (unmaintained) - current version of **Apache** 2.4 (in non-CLI images) - current version of **Xdebug** 3.5 (in debug images) - current version of [**SPX Profiler**](https://github.com/NoiseByNorthwest/php-spx) (in debug images) @@ -166,14 +166,14 @@ Available MariaDB images: - 10.11: `jakubboucek/lamp-devstack-mysql:10.11` - 11.4: `jakubboucek/lamp-devstack-mysql:11.4` - 11.8: `jakubboucek/lamp-devstack-mysql:11.8` -- 12.1: `jakubboucek/lamp-devstack-mysql:latest` +- 12.3: `jakubboucek/lamp-devstack-mysql:latest` -LTS (long-term support) MariaDB images (currently 11.8): +LTS (long-term support) MariaDB images (currently 12.3): - `jakubboucek/lamp-devstack-mysql:lts` -The RC pre-release of MariaDB 12.2 images have the `-rc` suffix, example: -- `jakubboucek/lamp-devstack-mysql:12.2-rc` -- `jakubboucek/lamp-devstack-mysql:12.2-1-rc` +The RC pre-release of MariaDB 13.0 images have the `-rc` suffix, example: +- `jakubboucek/lamp-devstack-mysql:13.0-rc` +- `jakubboucek/lamp-devstack-mysql:13.0.1-rc` ### Connecting to MariaDB diff --git a/build-mariadb.sh b/build-mariadb.sh index 2c4b518..9be7272 100755 --- a/build-mariadb.sh +++ b/build-mariadb.sh @@ -92,7 +92,6 @@ if [ "${NO_BUILD}" -ne "1" ]; then docker build --progress plain -f mysql/Dockerfile-11.8 -t jakubboucek/lamp-devstack-mysql:11.8 mysql/ docker tag jakubboucek/lamp-devstack-mysql:11.8 jakubboucek/lamp-devstack-mysql:11.8.${MARIADB_RELEASE} docker tag jakubboucek/lamp-devstack-mysql:11.8 jakubboucek/lamp-devstack-mysql:11 - docker tag jakubboucek/lamp-devstack-mysql:11.8 jakubboucek/lamp-devstack-mysql:lts fi if [ "${NO_TEST}" -ne "1" ]; then @@ -103,54 +102,55 @@ if [ "${NO_PUSH}" -ne "1" ]; then docker push jakubboucek/lamp-devstack-mysql:11.8.${MARIADB_RELEASE} docker push jakubboucek/lamp-devstack-mysql:11.8 docker push jakubboucek/lamp-devstack-mysql:11 - docker push jakubboucek/lamp-devstack-mysql:lts fi -### MariaDB - 12.2 +### MariaDB - 12.3 MARIADB_RELEASE=2 if [ "${NO_PULL}" -ne "1" ]; then - docker pull mariadb:12.2.${MARIADB_RELEASE} - docker tag mariadb:12.2.${MARIADB_RELEASE} mariadb:12.2 - docker run --rm mariadb:12.2 mariadb --version + docker pull mariadb:12.3.${MARIADB_RELEASE} + docker tag mariadb:12.3.${MARIADB_RELEASE} mariadb:12.3 + docker run --rm mariadb:12.3 mariadb --version fi if [ "${NO_BUILD}" -ne "1" ]; then - docker build --progress plain -f mysql/Dockerfile-12.2 -t jakubboucek/lamp-devstack-mysql:12.2 mysql/ - docker tag jakubboucek/lamp-devstack-mysql:12.2 jakubboucek/lamp-devstack-mysql:12.2.${MARIADB_RELEASE} - docker tag jakubboucek/lamp-devstack-mysql:12.2 jakubboucek/lamp-devstack-mysql:12 - docker tag jakubboucek/lamp-devstack-mysql:12.2 jakubboucek/lamp-devstack-mysql:latest + docker build --progress plain -f mysql/Dockerfile-12.3 -t jakubboucek/lamp-devstack-mysql:12.3 mysql/ + docker tag jakubboucek/lamp-devstack-mysql:12.3 jakubboucek/lamp-devstack-mysql:12.3.${MARIADB_RELEASE} + docker tag jakubboucek/lamp-devstack-mysql:12.3 jakubboucek/lamp-devstack-mysql:12 + docker tag jakubboucek/lamp-devstack-mysql:12.3 jakubboucek/lamp-devstack-mysql:latest + docker tag jakubboucek/lamp-devstack-mysql:12.3 jakubboucek/lamp-devstack-mysql:lts fi if [ "${NO_TEST}" -ne "1" ]; then - docker run --rm jakubboucek/lamp-devstack-mysql:12.2 mariadb --version + docker run --rm jakubboucek/lamp-devstack-mysql:12.3 mariadb --version fi if [ "${NO_PUSH}" -ne "1" ]; then - docker push jakubboucek/lamp-devstack-mysql:12.2.${MARIADB_RELEASE} - docker push jakubboucek/lamp-devstack-mysql:12.2 + docker push jakubboucek/lamp-devstack-mysql:12.3.${MARIADB_RELEASE} + docker push jakubboucek/lamp-devstack-mysql:12.3 docker push jakubboucek/lamp-devstack-mysql:12 docker push jakubboucek/lamp-devstack-mysql:latest + docker push jakubboucek/lamp-devstack-mysql:lts fi -### MariaDB - 12.3 +### MariaDB - 13.0 MARIADB_RELEASE=1 if [ "${NO_PULL}" -ne "1" ]; then - docker pull mariadb:12.3.${MARIADB_RELEASE}-rc - docker tag mariadb:12.3.${MARIADB_RELEASE}-rc mariadb:12.3-rc - docker run --rm mariadb:12.3-rc mariadb --version + docker pull mariadb:13.0.${MARIADB_RELEASE}-rc + docker tag mariadb:13.0.${MARIADB_RELEASE}-rc mariadb:13.0-rc + docker run --rm mariadb:13.0-rc mariadb --version fi if [ "${NO_BUILD}" -ne "1" ]; then - docker build --progress plain -f mysql/Dockerfile-12.3 -t jakubboucek/lamp-devstack-mysql:12.3-rc mysql/ - docker tag jakubboucek/lamp-devstack-mysql:12.3-rc jakubboucek/lamp-devstack-mysql:12.3.${MARIADB_RELEASE}-rc + docker build --progress plain -f mysql/Dockerfile-13.0 -t jakubboucek/lamp-devstack-mysql:13.0-rc mysql/ + docker tag jakubboucek/lamp-devstack-mysql:13.0-rc jakubboucek/lamp-devstack-mysql:13.0.${MARIADB_RELEASE}-rc fi if [ "${NO_TEST}" -ne "1" ]; then - docker run --rm jakubboucek/lamp-devstack-mysql:12.3-rc mariadb --version + docker run --rm jakubboucek/lamp-devstack-mysql:13.0-rc mariadb --version fi if [ "${NO_PUSH}" -ne "1" ]; then - docker push jakubboucek/lamp-devstack-mysql:12.3.${MARIADB_RELEASE}-rc - docker push jakubboucek/lamp-devstack-mysql:12.3-rc + docker push jakubboucek/lamp-devstack-mysql:13.0.${MARIADB_RELEASE}-rc + docker push jakubboucek/lamp-devstack-mysql:13.0-rc fi diff --git a/check-pulls.sh b/check-pulls.sh index b57413f..3eec031 100755 --- a/check-pulls.sh +++ b/check-pulls.sh @@ -18,5 +18,5 @@ docker pull mariadb:10.6 docker pull mariadb:10.11 docker pull mariadb:11.4 docker pull mariadb:11.8 -docker pull mariadb:12.2 -docker pull mariadb:12.3-rc +docker pull mariadb:12.3 +docker pull mariadb:13.0-rc diff --git a/mysql/Dockerfile-12.3 b/mysql/Dockerfile-12.3 index 30dd5f6..215b38f 100644 --- a/mysql/Dockerfile-12.3 +++ b/mysql/Dockerfile-12.3 @@ -1,7 +1,7 @@ -FROM mariadb:12.3-rc +FROM mariadb:12.3 LABEL maintainer="Jakub Bouček " -LABEL org.label-schema.name="MariaDB 12.3 (Release Candidate)" +LABEL org.label-schema.name="MariaDB 12.3" LABEL org.label-schema.vcs-url="https://github.com/jakubboucek/docker-lamp-devstack" # Workdir during installation diff --git a/mysql/Dockerfile-12.2 b/mysql/Dockerfile-13.0 similarity index 90% rename from mysql/Dockerfile-12.2 rename to mysql/Dockerfile-13.0 index 4d26237..817e91a 100644 --- a/mysql/Dockerfile-12.2 +++ b/mysql/Dockerfile-13.0 @@ -1,7 +1,7 @@ -FROM mariadb:12.2 +FROM mariadb:13.0-rc LABEL maintainer="Jakub Bouček " -LABEL org.label-schema.name="MariaDB 12.2" +LABEL org.label-schema.name="MariaDB 13.0 (Release Candidate)" LABEL org.label-schema.vcs-url="https://github.com/jakubboucek/docker-lamp-devstack" # Workdir during installation