fixed mariadb upgrade

Dockerfile

@@ -5,5 +5,5 @@ LABEL maintainer="Lukasz Jarosz <lukasz@jarosz.pl>"
 COPY files /
 
 RUN apk update && \
-    apk add --no-cache mariadb mariadb-server-utils  mariadb-client nginx pwgen su-exec python3 openssl && \
+    apk add --no-cache mariadb mariadb-server-utils mariadb-client nginx pwgen su-exec python3 openssl && \
     pip3 install acme-tiny

files/etc/s6/mariadb-upgrade/run

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+s6-svwait -ua /etc/s6/mariadb
+sleep 2
+
+echo "triggering MariaDB upgrade..."
+mysql_upgrade
+
+exec tail -f /dev/null

files/etc/s6/mariadb/setup

@@ -4,6 +4,7 @@ if [ ! -d /run/mysqld ]; then
   echo "/run/mysqld not found so creating one"
   mkdir -p /run/mysqld
 fi
+echo "ensuring /run/mysqld permissions"
 chown mysql:mysql /run/mysqld
 
 if [ /etc/my.cnf.d/mariadb-server.cnf ]; then
@@ -30,7 +31,7 @@ if [ ! -d $DATADIR ]; then
     if echo 'SELECT 1' | mysql &> /dev/null; then
       break
     fi
-    echo 'MySQL init process in progress...'
+    echo 'MariaDB init process in progress...'
     sleep 5
 	done
 
@@ -38,27 +39,9 @@ if [ ! -d $DATADIR ]; then
   cat /tmp/dbinit.sql | mysql
 
   if ! kill -s TERM "$pid" || ! wait "$pid"; then
-    echo >&2 'MySQL init process failed.'
+    echo >&2 'MariaDB init process failed.'
     exit 1
   fi
 
   rm /tmp/dbinit.sql
 fi
-
-su-exec mysql:mysql mysqld --bind-address=127.0.0.1 --datadir=$DATADIR &
-pid="$!"
-
-for i in {30..0}; do
-  if echo 'SELECT 1' | mysql &> /dev/null; then
-    break
-  fi
-  echo 'MySQL init process in progress...'
-  sleep 5
-done
-
-mysql_upgrade
-
-if ! kill -s TERM "$pid" || ! wait "$pid"; then
-  echo >&2 'MySQL upgrade process failed.'
-  exit 1
-fi