During startup, make sure the database is upgraded.

Author: jlesage

Dockerfile

@@ -24,6 +24,7 @@ RUN \
         nginx-mod-stream \
         mariadb \
         mariadb-client \
+        mariadb-server-utils \
         certbot \
         openssl \
         apache2-utils \

rootfs/etc/cont-init.d/nginx-proxy-manager.sh

@@ -7,6 +7,39 @@ log() {
     echo "[cont-init.d] $(basename $0): $*"
 }
 
+start_db() {
+    log "Starting database..."
+
+    # Start mysqld.
+    CUR_PWD="$(pwd)"
+    cd /etc/services.d/mysqld
+    ./run &
+    pid="$!"
+    cd "$CUR_PWD"
+
+    # Wait until it is ready.
+    for i in $(seq 1 30); do
+        if /etc/services.d/mysqld/data/check; then
+            break
+        fi
+        sleep 1
+    done
+
+    if ! /etc/services.d/mysqld/data/check; then
+        log "ERROR: Failed to start the database."
+        exit 1
+    fi
+}
+
+stop_db() {
+    # Kill mysqld.
+    log "Shutting down database..."
+    if ! kill -s TERM "$pid" || ! wait "$pid"; then
+        log "ERROR: initialization failed."
+        exit 1
+    fi
+}
+
 # Make sure mandatory directories exist.
 mkdir -p \
     /config/log/nginx \
@@ -43,60 +76,50 @@ if [ -d /config/mysql ] && [ -f /config/db_init_in_progress ]; then
     rm -r /config/mysql
 fi
 
-# Initialize the database data directory.
+# Create the database directory if required.
 if [ ! -d /config/mysql ]; then
-    MYSQL_DATABASE=nginxproxymanager
-    MYSQL_USER=nginxproxymanager
-    MYSQL_PASSWORD=password123
-
     touch /config/db_init_in_progress
 
     log "Initializing database data directory..."
     mysql_install_db --datadir=/config/mysql >/config/log/init_db.log 2>&1
+    chown -R $USER_ID:$GROUP_ID /config/mysql
     log "Database data directory initialized."
+fi
 
-    log "Starting database to perform its intialization..."
-
-    # Start mysqld.
-    chown -R "$USER_ID":"$GROUP_ID" /config/mysql
-    /etc/services.d/mysqld/run >>/config/log/init_db.log 2>&1 &
-    rc="$?"
-    pid="$!"
-    if [ "$rc" -ne 0 ]; then
-        log "ERROR: Failed to start the database."
-        exit 1
-    fi
+# Temporarily start the database.
+start_db
 
-    # Wait until it is ready.
-    for i in $(seq 1 30); do
-        if /etc/services.d/mysqld/data/check; then
-            break
-        fi
-        sleep 1
-    done
+# Initialize the database if required.
+if [ -f /config/db_init_in_progress ]; then
+    MYSQL_DATABASE=nginxproxymanager
+    MYSQL_USER=nginxproxymanager
+    MYSQL_PASSWORD=password123
 
     # Secure the installation.
     log "Securing database installation..."
     printf '\nn\n\n\n\n\n' | /usr/bin/mysql_secure_installation >>/config/log/init_db.log 2>&1
 
     log "Initializing database ..."
+
     # Create the database.
     echo "CREATE DATABASE IF NOT EXISTS \`$MYSQL_DATABASE\` ;" | mysql >>/config/log/init_db.log 2>&1
     # Create the user.
     echo "CREATE USER '$MYSQL_USER'@'%' IDENTIFIED BY '$MYSQL_PASSWORD' ;" | mysql >>/config/log/init_db.log 2>&1
     echo "GRANT ALL ON \`$MYSQL_DATABASE\`.* TO '$MYSQL_USER'@'%' ;" | mysql >>/config/log/init_db.log 2>&1
+fi
 
-    # Kill mysqld.
-    log "Shutting down database..."
-    if ! kill -s TERM "$pid" || ! wait "$pid"; then
-        log "ERROR: initialization failed."
-        exit 1
-    fi
+# Make sure to keep the database upgraded.
+if [ ! -f /config/db_init_in_progress ]; then
+    log "Upgrading database if required..."
+    /usr/bin/mysql_upgrade --silent
 fi
 
 # Database initialized properly.
 rm -f /config/db_init_in_progress
 
+# Stop the database.
+stop_db
+
 # Generate dummy self-signed certificate.
 if [ ! -f /config/nginx/dummycert.pem ] || [ ! -f /config/nginx/dummykey.pem ]
 then