From 019771a175d8772d36515348e74c8e282a21277e Mon Sep 17 00:00:00 2001
From: Dave Pedu <git@davepedu.com>
Date: Sat, 13 Feb 2016 16:24:11 -0800
Subject: [PATCH] Run mysql directly for smooth exits

---
 Dockerfile               | 3 +--
 README.md                | 5 +++++
 start                    | 2 ++
 supervisord-mariadb.conf | 3 +--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index efc0cb9..d5310e2 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,5 +19,4 @@ ADD start /start
 
 EXPOSE 3306
 
-ENTRYPOINT ["start"]
-
+# ENTRYPOINT ["/start"]
diff --git a/README.md b/README.md
index 3c10186..0db5d7c 100644
--- a/README.md
+++ b/README.md
@@ -4,3 +4,8 @@ docker-mariadb
 MariaDB (mysql) in a container.
 
 Suggested usage: `docker run -d -p 3306:3306 -v /host/overrides.conf:/etc/mysql/conf.d/overrides.conf -v /host/sqldata:/var/lib/mysql mariadb`
+
+Tips
+----
+
+* Change mysql listening port by setting the env var MYSQL_PORT.
diff --git a/start b/start
index 3f7f94d..9be3e8a 100755
--- a/start
+++ b/start
@@ -2,6 +2,8 @@
 
 trap 'kill $(jobs -p)' EXIT
 
+: ${MYSQL_PORT:=3306}
+
 if [ ! -d /var/lib/mysql/mysql ] ; then
     /usr/bin/mysql_install_db
 fi
diff --git a/supervisord-mariadb.conf b/supervisord-mariadb.conf
index 46a02e3..c8e75b3 100755
--- a/supervisord-mariadb.conf
+++ b/supervisord-mariadb.conf
@@ -1,4 +1,3 @@
 [program:mysql]
-command=/usr/bin/mysqld_safe
+command=/usr/sbin/mysqld --basedir=/usr --datadir=/var/lib/mysql --plugin-dir=/usr/lib/mysql/plugin --user=mysql --log-error=/var/log/mysql/error.log --pid-file=/var/run/mysqld/mysqld.pid --socket=/var/run/mysqld/mysqld.sock --port=%(ENV_MYSQL_PORT)s
 autorestart=true
-