From d45bbdbf50b2f56d9c3eb5fa39f9f9f6e0f2348a Mon Sep 17 00:00:00 2001
From: Phill Kelley <34226495+Paraphraser@users.noreply.github.com>
Date: Tue, 14 Feb 2023 11:33:18 +1100
Subject: [PATCH] 2023-02-14 MariaDB Dockerfile - experimental branch - PR 3 of
 3

Adjusts Dockerfile to cope with rename of internal file path
`/defaults/my.cnf` to `/defaults/custom.cnf`.

Strategy is to check for the presence of both files and then apply the
stability patches to the first match. This should mean that the
Dockerfile is backwards compatible with images that use `my.cnf`.

Signed-off-by: Phill Kelley <34226495+Paraphraser@users.noreply.github.com>
---
 .../services/mariadb/buildFiles/Dockerfile         | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.internal/templates/services/mariadb/buildFiles/Dockerfile b/.internal/templates/services/mariadb/buildFiles/Dockerfile
index 4cefb4b4a..36c4fa7c1 100644
--- a/.internal/templates/services/mariadb/buildFiles/Dockerfile
+++ b/.internal/templates/services/mariadb/buildFiles/Dockerfile
@@ -1,14 +1,18 @@
 # Download base image
 FROM ghcr.io/linuxserver/mariadb
 
+# candidates for customisation are
+ENV CANDIDATES="/defaults/my.cnf /defaults/custom.cnf"
+
 # apply stability patches recommended in
 #   
 #   https://discord.com/channels/638610460567928832/638610461109256194/825049573520965703
 #   https://stackoverflow.com/questions/61809270/how-to-discover-why-mariadb-crashes
-RUN sed -i.bak \
-  -e "s/^thread_cache_size/# thread_cache_size/" \
-  -e "s/^read_buffer_size/# read_buffer_size/" \
-  /defaults/my.cnf
+RUN for CNF in ${CANDIDATES} ; do [ -f ${CNF} ] && break ; done ; \
+    sed -i.bak \
+        -e "s/^thread_cache_size/# thread_cache_size/" \
+        -e "s/^read_buffer_size/# read_buffer_size/" \
+        ${CNF}
 
 # copy the health-check script into place
 ENV HEALTHCHECK_SCRIPT "iotstack_healthcheck.sh"
@@ -22,4 +26,6 @@ HEALTHCHECK \
    --retries=3 \
    CMD ${HEALTHCHECK_SCRIPT} || exit 1
 
+ENV CANDIDATES=
+
 # EOF