From dadda1c175830f19e6ff0e539b19fd137b6d3971 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Wed, 18 Mar 2020 22:54:40 +0100
Subject: [PATCH] MySQL socket auth tries to be funny, so run init as root

---
 apk/spoc                                             |  2 +-
 lxc-apps/mifosx/install.sh                           | 12 ++++++------
 lxc-services/mariadb/image                           |  8 +++++---
 .../mariadb/image.d/etc/services.d/.s6-svscan/finish |  3 +++
 .../mariadb/image.d/etc/services.d/mysqld/run        |  5 +++++
 5 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100755 lxc-services/mariadb/image.d/etc/services.d/.s6-svscan/finish
 create mode 100755 lxc-services/mariadb/image.d/etc/services.d/mysqld/run

diff --git a/apk/spoc b/apk/spoc
index fc42131..44c1a86 160000
--- a/apk/spoc
+++ b/apk/spoc
@@ -1 +1 @@
-Subproject commit fc42131bb6acaa9d474930add14f9e7fdf055bf5
+Subproject commit 44c1a8638d651a55e558ca9d97cd2222a367eeac
diff --git a/lxc-apps/mifosx/install.sh b/lxc-apps/mifosx/install.sh
index fdc3baa..83eadb2 100755
--- a/lxc-apps/mifosx/install.sh
+++ b/lxc-apps/mifosx/install.sh
@@ -10,12 +10,12 @@ MIFOSX_CONF="${VOLUMES_DIR}/mifosx/mifosx_conf"
 install -o 100000 -g 100000 -m 755 -d ${MARIADB_CONF}
 install -o 103306 -g 103306 -m 750 -d ${MARIADB_DATA}
 install -o 100000 -g 100000 -m 644 mariadb_conf/my.cnf ${MARIADB_CONF}/my.cnf
-spoc-container exec -u 0 -g 0 mifosx-mariadb -- mysql_install_db --user=mysql --datadir=/var/lib/mysql --auth-root-authentication-method=socket --skip-test-db
+spoc-container exec mifosx-mariadb -- mysql_install_db --user=mysql --datadir=/var/lib/mysql --auth-root-authentication-method=socket --skip-test-db
 
 # Create databases
 export MIFOSX_PWD=$(head -c 18 /dev/urandom | base64 | tr -d '+/=')
 spoc-container start mifosx-mariadb
-envsubst <createdb.sql | spoc-container exec mifosx-mariadb -- mysql -u mysql
+envsubst <createdb.sql | spoc-container exec mifosx-mariadb -- mysql
 
 # Configure Mifos X
 install -o 100000 -g 100000 -m 755 -d ${MIFOSX_CONF}
@@ -23,8 +23,8 @@ envsubst <mifosx_conf/context.xml | install -o 100000 -g 100000 -m 644 /dev/stdi
 install -o 100000 -g 100000 -m 644 mifosx_conf/server.xml ${MIFOSX_CONF}/server.xml
 
 # Populate database
-spoc-container exec mifosx -- cat /tmp/mifospltaform-tenants-first-time-install.sql | spoc-container exec mifosx-mariadb -- mysql -u mysql mifosplatform-tenants
-envsubst <schemapwd.sql | spoc-container exec mifosx-mariadb -- mysql -u mysql mifosplatform-tenants
+spoc-container exec mifosx -- cat /tmp/mifospltaform-tenants-first-time-install.sql | spoc-container exec mifosx-mariadb -- mysql mifosplatform-tenants
+envsubst <schemapwd.sql | spoc-container exec mifosx-mariadb -- mysql mifosplatform-tenants
 
 # Populate database
 spoc-container start mifosx
@@ -34,14 +34,14 @@ done
 spoc-container stop mifosx
 
 # Fix missing previous_run_status column
-echo 'ALTER TABLE `scheduled_email_campaign` ADD `previous_run_status` VARCHAR(10) NULL;' | spoc-container exec mifosx-mariadb -- mysql -u mysql mifostenant-default
+echo 'ALTER TABLE `scheduled_email_campaign` ADD `previous_run_status` VARCHAR(10) NULL;' | spoc-container exec mifosx-mariadb -- mysql mifostenant-default
 
 # Update admin account
 export MIFOSX_ADMIN_USER=admin
 export MIFOSX_ADMIN_EMAIL=admin@example.com
 export MIFOSX_ADMIN_PWD=$(head -c 12 /dev/urandom | base64 | tr -d '+/=')
 export MIFOSX_ADMIN_HASH=$(echo -n "${MIFOSX_ADMIN_PWD}{1}" | sha256sum | awk '{print $1}')
-envsubst <adminpwd.sql | spoc-container exec mifosx-mariadb -- mysql -u mysql mifostenant-default
+envsubst <adminpwd.sql | spoc-container exec mifosx-mariadb -- mysql mifostenant-default
 
 # Stop services required for setup
 spoc-container stop mifosx-mariadb
diff --git a/lxc-services/mariadb/image b/lxc-services/mariadb/image
index 5aec0ad..7f4c0be 100644
--- a/lxc-services/mariadb/image
+++ b/lxc-services/mariadb/image
@@ -14,7 +14,9 @@ RUN EOF
     chown mysql:mysql /run/mysqld
 EOF
 
-USER mysql
-CMD /usr/bin/mysqld
-READY /usr/bin/test -e /run/mysqld/mysqld.sock
+# Due to MySQL's socket authentication design the container init needs to be run as root
+COPY image.d
+
+CMD /bin/s6-svscan /etc/services.d
+READY /bin/sh -c "echo 'SELECT version()'| mysql"
 HALT SIGTERM
diff --git a/lxc-services/mariadb/image.d/etc/services.d/.s6-svscan/finish b/lxc-services/mariadb/image.d/etc/services.d/.s6-svscan/finish
new file mode 100755
index 0000000..c80dee8
--- /dev/null
+++ b/lxc-services/mariadb/image.d/etc/services.d/.s6-svscan/finish
@@ -0,0 +1,3 @@
+#!/bin/execlineb -P
+
+foreground { s6-svwait -d -t 3000 mysqld }
diff --git a/lxc-services/mariadb/image.d/etc/services.d/mysqld/run b/lxc-services/mariadb/image.d/etc/services.d/mysqld/run
new file mode 100755
index 0000000..7119753
--- /dev/null
+++ b/lxc-services/mariadb/image.d/etc/services.d/mysqld/run
@@ -0,0 +1,5 @@
+#!/bin/execlineb -P
+
+fdmove -c 2 1
+s6-setuidgid mysql
+/usr/bin/mysqld