Merge pull request #796 from Paraphraser/20250424-mariadb-master

2025-04-24 mariadb - master branch - PR 1 of 2

Author: Slyke

.templates/mariadb/Dockerfile

@@ -8,14 +8,16 @@ ENV CANDIDATES="/defaults/my.cnf /defaults/custom.cnf"
 #   
 #   https://discord.com/channels/638610460567928832/638610461109256194/825049573520965703
 #   https://stackoverflow.com/questions/61809270/how-to-discover-why-mariadb-crashes
+#   as at 2025-04-23, thread_cache_size is ignored (at least for MariaDB versions 10.6.9
+#   through 11.4.5 where it always has the value 100). It could probably be removed.
 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"
+ENV HEALTHCHECK_SCRIPT="iotstack_healthcheck.sh"
 COPY ${HEALTHCHECK_SCRIPT} /usr/local/bin/${HEALTHCHECK_SCRIPT}
 
 # define the health check
@@ -29,3 +31,4 @@ HEALTHCHECK \
 ENV CANDIDATES=
 
 # EOF
+

.templates/mariadb/iotstack_healthcheck.sh

@@ -7,16 +7,22 @@ HEALTHCHECK_PORT="${MYSQL_TCP_PORT:-3306}"
 # the expected response is?
 EXPECTED="mysqld is alive"
 
+# handle root password presence/absence
+unset ARGUMENT
+if [ -n "${MYSQL_ROOT_PASSWORD}" ] ; then
+   if ! $(mariadb -u root -e 'quit' &> /dev/null) ; then
+      ARGUMENT="-p${MYSQL_ROOT_PASSWORD}"
+   fi
+fi
+
 # run the check
-if [ -z "$MYSQL_ROOT_PASSWORD" ] ; then
-   RESPONSE=$(mysqladmin ping -h localhost)
+if [ -n "$(which mariadb-admin)" ] ; then
+   RESPONSE=$(mariadb-admin ping ${ARGUMENT})
 else
-   # note - there is NO space between "-p" and the password. This is
-   # intentional. It is part of the mysql and mysqladmin API.
-   RESPONSE=$(mysqladmin -p${MYSQL_ROOT_PASSWORD} ping -h localhost)
+   RESPONSE=$(mysqladmin ping ${ARGUMENT})
 fi
 
-# did the mysqladmin command succeed?
+# did the ping succeed?
 if [ $? -eq 0 ] ; then
 
    # yes! is the response as expected?