Add MariaDB 11.4 to testing and MySQL 8.4, and exclude MySQL from the SSL test

.github/workflows/run-tests.yml

@@ -14,8 +14,41 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                database-image: ["mariadb:10.6", "mariadb:10.11", "mariadb:latest", "mysql:5.7", "mysql:latest"]
-                configuration: ["default", "one-host", "one-socket-host", "config-mount-dir", "fs-import-export", "different-apache-port", "run-as-www-data", "one-ssl-host"]
+                database-image: [
+                  "mariadb:10.6",
+                  "mariadb:10.11",
+                  "mariadb:11.4",
+                  "mariadb:latest",
+                  "mysql:5.7",
+                  "mysql:8.4",
+                  "mysql:latest"
+                ]
+                configuration: [
+                  "default",
+                  "one-host",
+                  "one-socket-host",
+                  "config-mount-dir",
+                  "fs-import-export",
+                  "different-apache-port",
+                  "run-as-www-data"
+                ]
+                include:
+                  - {
+                      database-image: "mariadb:10.6",
+                      configuration: "one-ssl-host"
+                    }
+                  - {
+                      database-image: "mariadb:10.11",
+                      configuration: "one-ssl-host"
+                    }
+                  - {
+                      database-image: "mariadb:11.4",
+                      configuration: "one-ssl-host"
+                    }
+                  - {
+                      database-image: "mariadb:latest",
+                      configuration: "one-ssl-host"
+                    }
 
         steps:
             - uses: actions/checkout@v4

Dockerfile-debian.template

@@ -51,12 +51,7 @@ RUN set -ex; \
     ldd "$extdir"/*.so | grep -qzv "=> not found" || (echo "Sanity check failed: missing libraries:"; ldd "$extdir"/*.so | grep " => not found"; exit 1); \
     ldd "$extdir"/*.so | grep -q "libzip.so.* => .*/libzip.so.*" || (echo "Sanity check failed: libzip.so is not referenced"; ldd "$extdir"/*.so; exit 1); \
     err="$(php --version 3>&1 1>&2 2>&3)"; \
-    [ -z "$err" ] || (echo "Sanity check failed: php returned errors; $err"; exit 1;); \
-    \
-    apt-mark auto '.*' > /dev/null; \
-    apt-mark manual $savedAptMark; \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
+    [ -z "$err" ] || (echo "Sanity check failed: php returned errors; $err"; exit 1;);
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php

apache/Dockerfile

@@ -52,12 +52,7 @@ RUN set -ex; \
     ldd "$extdir"/*.so | grep -qzv "=> not found" || (echo "Sanity check failed: missing libraries:"; ldd "$extdir"/*.so | grep " => not found"; exit 1); \
     ldd "$extdir"/*.so | grep -q "libzip.so.* => .*/libzip.so.*" || (echo "Sanity check failed: libzip.so is not referenced"; ldd "$extdir"/*.so; exit 1); \
     err="$(php --version 3>&1 1>&2 2>&3)"; \
-    [ -z "$err" ] || (echo "Sanity check failed: php returned errors; $err"; exit 1;); \
-    \
-    apt-mark auto '.*' > /dev/null; \
-    apt-mark manual $savedAptMark; \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
+    [ -z "$err" ] || (echo "Sanity check failed: php returned errors; $err"; exit 1;);
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php

fpm/Dockerfile

@@ -49,12 +49,7 @@ RUN set -ex; \
     ldd "$extdir"/*.so | grep -qzv "=> not found" || (echo "Sanity check failed: missing libraries:"; ldd "$extdir"/*.so | grep " => not found"; exit 1); \
     ldd "$extdir"/*.so | grep -q "libzip.so.* => .*/libzip.so.*" || (echo "Sanity check failed: libzip.so is not referenced"; ldd "$extdir"/*.so; exit 1); \
     err="$(php --version 3>&1 1>&2 2>&3)"; \
-    [ -z "$err" ] || (echo "Sanity check failed: php returned errors; $err"; exit 1;); \
-    \
-    apt-mark auto '.*' > /dev/null; \
-    apt-mark manual $savedAptMark; \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
+    [ -z "$err" ] || (echo "Sanity check failed: php returned errors; $err"; exit 1;);
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php

testing/docker-compose/docker-compose.testing-one-ssl-host.yml

@@ -4,16 +4,10 @@ services:
   db_server:
     image: ${DB:-mariadb:11}
     command:
-      - "--plugin_load_add=server_audit"
-      - "--server_audit=FORCE_PLUS_PERMANENT"
-      - "--server_audit_events=connect"
-      - "--server_audit_logging"
-      #- "--server_audit_file_path=/var/log/mariadb-audit/audit.log"
       - "--ssl-ca=/etc/phpmyadmin/ssl/ca-cert.pem"
       - "--ssl-cert=/etc/phpmyadmin/ssl/server-cert.pem"
       - "--ssl-key=/etc/phpmyadmin/ssl/server-key.pem"
       - "--require-secure-transport=ON"
-      - "--server-audit-logging=ON"
     environment:
       MARIADB_USER: secure-user
       MARIADB_PASSWORD: "${TESTSUITE_PASSWORD:-my-secret-pw}"