v1.3.0 (#13)

Major updates
* Updating to latest Alpine S6
* Adding -u flag to executables and updating code accordingly
* Using new _disable executable

Minor updates
* Improving log output
* Trimming whitespace

Documentation updates
* Adding comments to mariadb/finish

Author: bfren

.github/workflows/build-dev.yml

@@ -22,7 +22,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
       -
         name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/build-main.yml

@@ -56,7 +56,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
       -
         name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

Dockerfile

@@ -1,4 +1,5 @@
-FROM bcgdesign/alpine-s6:alpine-3.13-1.2.1
+#FROM bcgdesign/alpine-s6:alpine-3.13-1.2.1
+FROM bcgdesign/alpine-s6:dev
 
 LABEL maintainer="Ben Green <ben@bcgdesign.com>" \
     org.label-schema.name="MariaDB" \

README.md

@@ -108,5 +108,5 @@ $ docker exec -it mariadb db-export "foo" # 'foo' database dumped to /var/lib/ba
 
 ## Copyright
 
-> Copyright (c) 2021 Ben Green <https://bcgdesign.com>  
+> Copyright (c) 2021 Ben Green <https://bcgdesign.com>
 > Unless otherwise stated

VERSION

@@ -1 +1 @@
-1.2.4
+1.3.0

overlay/etc/db/backup

@@ -67,5 +67,5 @@ if [ "${BACKUP_KEEP_FOR_DAYS}" -gt 0 ] ; then
     MMIN=$((60*24*${BACKUP_KEEP_FOR_DAYS}))
     find ${BACKUP_PATH}/* -type d -mmin +${MMIN} | xargs rm -rf
     _done
-    
+
 fi

overlay/etc/db/generate-init-file

@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-set -eo pipefail
+set -euo pipefail
 
 
 #======================================================================================================================
@@ -51,7 +51,7 @@ _echo " .. delete test database"
 echo "DROP DATABASE IF EXISTS test;" >> ${INIT_FILE}
 
 # if database(s) specified, create (each) database and grant user permissions
-if [ -n "${MARIADB_DATABASE}" ] ; then
+if [ ! -z "${MARIADB_DATABASE-}" ] ; then
 
     _echo " .. add application databases:"
     DATABASES=$(echo ${MARIADB_DATABASE} | tr "," "\n")

overlay/etc/db/import

@@ -16,7 +16,7 @@ for FILE in /var/lib/backup/*.sql ; do
 
     # execute file
     _echo " .. importing '${DATABASE}'"
-    mariadb "${DATABASE}" < ${FILE} || _error " .. error"
+    mariadb "${DATABASE}" < ${FILE} || _notok " .. something went wrong"
 
 done
 _done

overlay/etc/services.d/mariadb-upgrade/run

@@ -1,5 +1,8 @@
 #!/usr/bin/with-contenv bash
 
+set -euo pipefail
+
+
 #======================================================================================================================
 # Wait until MariaDB is running before attempting the upgrade
 #======================================================================================================================
@@ -17,7 +20,8 @@ else
 
     # wait 2s before exiting the service - S6 will keep restarting it until MariaDB comes online
     # on first run, the mariadb service will disable this upgrade service itself
-    _echo "Waiting for MariaDB to come online..."
-    sleep 2s
+    SLEEP=2
+    _echo "Waiting ${SLEEP}s for MariaDB to come online..."
+    sleep ${SLEEP}
 
 fi

overlay/etc/services.d/mariadb/finish

@@ -1,2 +1,10 @@
 #!/usr/bin/with-contenv bash
+
+set -euo pipefail
+
+
+#======================================================================================================================
+# Use base executable to terminate all services
+#======================================================================================================================
+
 _terminate

overlay/etc/services.d/mariadb/run

@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-set -eo pipefail
+set -euo pipefail
 
 
 #======================================================================================================================
@@ -30,10 +30,10 @@ else
     db-upgrade-disable
 
     # check for root password
-    [[ -z "${MARIADB_ROOT_PASSWORD}" ]] && _error "MARIADB_ROOT_PASSWORD must be set."
+    [[ -z "${MARIADB_ROOT_PASSWORD-}" ]] && _error "MARIADB_ROOT_PASSWORD must be set."
 
     # check for application user and password
-    [[ -z "${MARIADB_USERNAME}" || -z "${MARIADB_PASSWORD}" ]] && _error "MARIADB_USERNAME and MARIADB_PASSWORD must be set."
+    [[ -z "${MARIADB_USERNAME-}" || -z "${MARIADB_PASSWORD-}" ]] && _error "MARIADB_USERNAME and MARIADB_PASSWORD must be set."
 
     # run server installation
     _echo "Running mariadb-install-db..."

overlay/usr/local/bin/db-backup

@@ -1,5 +1,8 @@
 #!/usr/bin/with-contenv bash
 
+set -eo pipefail
+
+
 #======================================================================================================================
 # Run /etc/db/backup executable
 #======================================================================================================================

overlay/usr/local/bin/db-export

@@ -10,5 +10,5 @@ set -euo pipefail
 if [ $# -eq 1 ] && [ -n "${1}" ] ; then
     s6-setuidgid mysql /etc/db/export "${1}"
 else
-    _error "You must specify a database name."
+    _error "db-export: You must specify a database name."
 fi

overlay/usr/local/bin/db-upgrade

@@ -1,8 +1,10 @@
 #!/usr/bin/with-contenv bash
 
+set -euo pipefail
+
+
 #======================================================================================================================
-# Run mariadb-upgrade
-#   -f using -f (--force) to enforce upgrade checks, even if they have already been performed
+# Run mariadb-upgrade as root user
 #======================================================================================================================
 
 _echo "Running mariadb-upgrade..."

overlay/usr/local/bin/db-upgrade-disable

@@ -1,9 +1,10 @@
 #!/usr/bin/with-contenv bash
 
+set -euo pipefail
+
+
 #======================================================================================================================
-# Disable mariadb-upgrade service
+# Use base executable to disable upgrade service
 #======================================================================================================================
 
-_echo "Disabling mariadb-upgrade service..."
-s6-svc -d /var/run/s6/services/mariadb-upgrade
-_done
+_disable "mariadb-upgrade"

overlay/usr/local/bin/healthcheck

@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-set -euo pipefail
+set -eo pipefail
 
 
 #======================================================================================================================