From 787b52b67beb1a9b8f0fc323221c4dde88f4ebc5 Mon Sep 17 00:00:00 2001
From: Adnan Abdulhussein <adnan@bitnami.com>
Date: Wed, 20 May 2015 16:57:26 -0700
Subject: [PATCH] Use /conf.defaults similar to nginx

---
 bitnami/mariadb/Dockerfile    | 8 +++++---
 bitnami/mariadb/entrypoint.sh | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/bitnami/mariadb/Dockerfile b/bitnami/mariadb/Dockerfile
index 6f59aef20f21..00c39a4bc120 100644
--- a/bitnami/mariadb/Dockerfile
+++ b/bitnami/mariadb/Dockerfile
@@ -8,9 +8,11 @@ RUN apt-get update -q && DEBIAN_FRONTEND=noninteractive apt-get install -qy wget
     /opt/bitnami/mysql/scripts/ctl.sh stop mysql > /dev/null && \
     echo "bin/mysql -S /opt/bitnami/mysql/tmp/mysql.sock -u root -p\$2 -e \"GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY '\$2' WITH GRANT OPTION;\"" >> /opt/bitnami/mysql/scripts/myscript.sh && \
     rm -rf /tmp/* /opt/bitnami/mysql/data /opt/bitnami/ctlscript.sh && \
-    ln -s /data /opt/bitnami/mysql/data && \
-    mv /opt/bitnami/mysql/my.cnf /opt/bitnami/mysql/my.cnf.default && \
-    ln -s /conf/my.cnf /opt/bitnami/mysql/my.cnf && \
+    mkdir /opt/bitnami/mysql/conf.defaults && \
+    mv /opt/bitnami/mysql/my.cnf /opt/bitnami/mysql/conf.defaults/ && \
+    ln -s /opt/bitnami/mysql/conf/my.cnf /opt/bitnami/mysql/my.cnf && \
+    ln -s /opt/bitnami/mysql/conf /conf && \
+    ln -s /opt/bitnami/mysql/data /data && \
     DEBIAN_FRONTEND=noninteractive apt-get --purge autoremove -qy wget && apt-get clean && rm -rf /var/lib/apt && rm -rf /var/cache/apt/archives/*
 
 ENV PATH /opt/bitnami/mysql/bin:$PATH
diff --git a/bitnami/mariadb/entrypoint.sh b/bitnami/mariadb/entrypoint.sh
index 3e461f8b15c0..dec97f0292ae 100755
--- a/bitnami/mariadb/entrypoint.sh
+++ b/bitnami/mariadb/entrypoint.sh
@@ -10,10 +10,10 @@ fi
 if [ "$1" = 'mysqld.bin' ]; then
   set -- "$@" --defaults-file=/opt/bitnami/mysql/my.cnf --basedir=/opt/bitnami/mysql --datadir=/opt/bitnami/mysql/data --plugin-dir=/opt/bitnami/mysql/lib/plugin --user=mysql --socket=/opt/bitnami/mysql/tmp/mysql.sock$EXTRA_OPTIONS
 
-  if [ ! -f "/conf/my.cnf" ]; then
+  if [ ! "$(ls -A /conf)" ]; then
     echo "Copying default configuration to /conf/my.cnf..."
     echo ""
-    cp /opt/bitnami/mysql/my.cnf.default /conf/my.cnf
+    cp -r /opt/bitnami/mysql/conf.defaults/* /opt/bitnami/mysql/conf
   fi
 
   if [ ! "$(ls -A /data)" ]; then