przejscie na nowsze wersje gitea oraz naprawienie procesu upgradeu mariadb

Dockerfile

@@ -1,9 +1,9 @@
-FROM gitea/gitea:latest
+FROM gitea/gitea:1.8
 
 LABEL maintainer="Lukasz Jarosz <lukasz@jarosz.pl>"
 
 COPY files /
 
 RUN apk update && \
-    apk add --no-cache mariadb 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/setup

@@ -6,6 +6,11 @@ if [ ! -d /run/mysqld ]; then
 fi
 chown mysql:mysql /run/mysqld
 
+if [ /etc/my.cnf.d/mariadb-server.cnf ]; then
+  echo "Deleting dumb configuration file in newer mariadb alpine package"
+  rm /etc/my.cnf.d/mariadb-server.cnf
+fi
+
 if [ ! -d $DATADIR ]; then
   echo "initializing db because $DATADIR is missing"
 
@@ -38,4 +43,22 @@ if [ ! -d $DATADIR ]; then
   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