From 5e657a9a5284b84448828657656a6a9214ca6f36 Mon Sep 17 00:00:00 2001 From: Arne Tarara Date: Mon, 17 Aug 2026 10:21:05 +0200 Subject: [PATCH 1/2] Upgraded MariaDB to 12.3.2 --- energy-tests/Dockerfile-mariadb | 2 +- energy-tests/compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/energy-tests/Dockerfile-mariadb b/energy-tests/Dockerfile-mariadb index ee69078469..ea9a5ffc4e 100644 --- a/energy-tests/Dockerfile-mariadb +++ b/energy-tests/Dockerfile-mariadb @@ -1,3 +1,3 @@ -FROM mariadb:10.8.2-focal +FROM mariadb:12.3.2-noble COPY ./wordpress-dump.sql /docker-entrypoint-initdb.d/wordpress-dump.sql EXPOSE 3306 diff --git a/energy-tests/compose.yml b/energy-tests/compose.yml index 87b139c3aa..35d9f4a9f7 100644 --- a/energy-tests/compose.yml +++ b/energy-tests/compose.yml @@ -16,7 +16,7 @@ services: - 3306 healthcheck: test: [ - "CMD", "bash", "-c", "mysqladmin ping -h localhost -u wordpress -pwordpress | grep \"mysqld is alive\"" + "CMD", "bash", "-c", "mariadb -h localhost -u wordpress -pwordpress -e 'SELECT 1' >/dev/null 2>&1" ] interval: "1h" # effectively turns repeated healthchecks during runtime off start_period: "60s" From cffd211ebf80ae971dc002f2300521fa1df317da Mon Sep 17 00:00:00 2001 From: Arne Tarara Date: Mon, 17 Aug 2026 11:00:55 +0200 Subject: [PATCH 2/2] Moving to latest for all Docker Images now that we have container dependency inspection --- energy-tests/Dockerfile-mariadb | 2 +- energy-tests/Dockerfile-wordpress | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/energy-tests/Dockerfile-mariadb b/energy-tests/Dockerfile-mariadb index ea9a5ffc4e..9ff0e09aa9 100644 --- a/energy-tests/Dockerfile-mariadb +++ b/energy-tests/Dockerfile-mariadb @@ -1,3 +1,3 @@ -FROM mariadb:12.3.2-noble +FROM mariadb:latest COPY ./wordpress-dump.sql /docker-entrypoint-initdb.d/wordpress-dump.sql EXPOSE 3306 diff --git a/energy-tests/Dockerfile-wordpress b/energy-tests/Dockerfile-wordpress index f3c86bb00d..fe046d61a5 100644 --- a/energy-tests/Dockerfile-wordpress +++ b/energy-tests/Dockerfile-wordpress @@ -1,4 +1,4 @@ -FROM wordpress:7.0.4-php8.3-apache +FROM wordpress:latest EXPOSE 9875 COPY ./html /var/www/html COPY ./wordpress.conf /etc/apache2/sites-enabled/wordpress.conf