From 259738c31a62b5779762683cdd04fdf3a4ed9d38 Mon Sep 17 00:00:00 2001
From: Ollie <oliver.hyde@wikimedia.de>
Date: Fri, 15 May 2026 10:34:02 +0100
Subject: [PATCH 1/2] Don't mount `docker.my.cnf` in `docker-compose.yml`

This should be in the container image instead of only being mounted in the docker compose dev env

Bug: T426216
---
 docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8bc2a224f..e14f0e183 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,6 @@ services:
       - ./start.sh:/usr/local/bin/start
       - api-storage:/var/www/html/storage/
       - ./words:/words
-      - ./docker.my.cnf:/etc/mysql/conf.d/custom.mysql.cnf
     ports:
       - 8082:80
     restart: always

From 37e3b316e77c94baa943cf07b0a6b0734389287a Mon Sep 17 00:00:00 2001
From: Ollie <oliver.hyde@wikimedia.de>
Date: Fri, 15 May 2026 11:00:04 +0100
Subject: [PATCH 2/2] Add mariadb client config to Dockerfile to not require
 ssl

Bug: T426216
---
 Dockerfile                        | 5 ++++-
 docker.my.cnf => docker.mysql.cnf | 0
 2 files changed, 4 insertions(+), 1 deletion(-)
 rename docker.my.cnf => docker.mysql.cnf (100%)

diff --git a/Dockerfile b/Dockerfile
index 302fc69b1..5fb67fc98 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ FROM php:8.2-apache
 
 RUN apt-get update \
 	# Needed for the imagick php extension install
-	&& apt-get install -y --no-install-recommends libmagickwand-dev libpq-dev mariadb-client\
+	&& apt-get install -y --no-install-recommends libmagickwand-dev libpq-dev mariadb-client \
 	&& echo "" | pecl install imagick redis \
 	&& docker-php-ext-enable imagick \
 	&& docker-php-ext-enable redis \
@@ -40,6 +40,9 @@ RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-av
 
 COPY --chown=www-data:www-data --from=composer /tmp/src2 /var/www/html
 
+# Copy custom mysql config file to the container to set the `skip-ssl` option.
+COPY ./docker.mysql.cnf /etc/mysql/conf.d/docker.mysql.cnf
+
 WORKDIR /var/www/html
 
 COPY ./start.sh /usr/local/bin/start
diff --git a/docker.my.cnf b/docker.mysql.cnf
similarity index 100%
rename from docker.my.cnf
rename to docker.mysql.cnf