From 1c3f150987d32125bf2546b8272dcfe14d928b18 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Thu, 7 Apr 2016 17:03:45 +0530
Subject: [PATCH] updated to mariadb-10.1.12-0

Notable Changes:
 - root password is optional
---
 bitnami/mariadb/Dockerfile               | 20 +++++---------------
 bitnami/mariadb/rootfs/app-entrypoint.sh | 15 ++++-----------
 2 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/bitnami/mariadb/Dockerfile b/bitnami/mariadb/Dockerfile
index e0f47d1c2253..3d71317042ba 100644
--- a/bitnami/mariadb/Dockerfile
+++ b/bitnami/mariadb/Dockerfile
@@ -2,32 +2,22 @@ FROM gcr.io/stacksmith-images/ubuntu:14.04-r05
 MAINTAINER Bitnami <containers@bitnami.com>
 
 ENV BITNAMI_APP_NAME=mariadb \
-    BITNAMI_APP_USER=mysql \
-    BITNAMI_APP_VERSION=10.1.11-0 \
-    MARIADB_PACKAGE_SHA256="59cb45e66e7b9b3697296cca8ad8c988ddc089016fef94b7133587cb838c8505"
+    BITNAMI_APP_VERSION=10.1.12-0 \
+    BITNAMI_APP_USER=mysql
 
 ENV BITNAMI_APP_DIR=/opt/bitnami/$BITNAMI_APP_NAME \
     BITNAMI_APP_VOL_PREFIX=/bitnami/$BITNAMI_APP_NAME
 
 ENV PATH=$BITNAMI_APP_DIR/sbin:$BITNAMI_APP_DIR/bin:$PATH
 
-RUN bitnami-pkg unpack $BITNAMI_APP_NAME-$BITNAMI_APP_VERSION
-
-# these symlinks should be setup by harpoon at unpack
-RUN mkdir -p $BITNAMI_APP_VOL_PREFIX && \
-    ln -s $BITNAMI_APP_DIR/data $BITNAMI_APP_VOL_PREFIX/data && \
-    ln -s $BITNAMI_APP_DIR/conf $BITNAMI_APP_VOL_PREFIX/conf && \
-    ln -s $BITNAMI_APP_DIR/logs $BITNAMI_APP_VOL_PREFIX/logs
-
-# temporary fix for mysql client
-RUN mkdir $BITNAMI_APP_DIR/var && \
-    ln -sf $BITNAMI_APP_DIR/tmp $BITNAMI_APP_DIR/var/mysql
+RUN bitnami-pkg install base-functions-1.0.0-2 --checksum 9789082a1e01a4411198136477723288736d5ad5990403a208423b39369c8aac
+RUN bitnami-pkg unpack mariadb-10.1.12-0 --checksum 98e45fb19b8087496b0be614bf5c2cf9d849f7d828984ff85e4aa941692d1d35
 
 COPY rootfs/ /
 
 EXPOSE 3306
 
-VOLUME ["$BITNAMI_APP_VOL_PREFIX/data"]
+VOLUME ["$BITNAMI_APP_VOL_PREFIX"]
 
 ENTRYPOINT ["/app-entrypoint.sh"]
 CMD ["harpoon", "start", "--foreground", "mariadb"]
diff --git a/bitnami/mariadb/rootfs/app-entrypoint.sh b/bitnami/mariadb/rootfs/app-entrypoint.sh
index 368be94059c0..c6d8effe05c7 100755
--- a/bitnami/mariadb/rootfs/app-entrypoint.sh
+++ b/bitnami/mariadb/rootfs/app-entrypoint.sh
@@ -1,21 +1,14 @@
 #!/bin/bash
 set -e
 
+chown $BITNAMI_APP_USER: $BITNAMI_APP_VOL_PREFIX || true
+
 if [[ "$1" == "harpoon" && "$2" == "start" ]]; then
   status=`harpoon inspect $BITNAMI_APP_NAME`
   if [[ "$status" == *'"lifecycle": "unpacked"'* ]]; then
-    harpoon initialize $BITNAMI_APP_NAME --password ${MARIADB_PASSWORD:-password}
-
-    ## disable DNS lookups
-    # this should happen in harpoon initialize, controlled by a argument, eg. --skip-name-resolve
-    (
-      echo ""
-      echo "[mysqld]"
-      echo "skip-name-resolve"
-    ) >> $BITNAMI_APP_DIR/conf/my.cnf
+    harpoon initialize $BITNAMI_APP_NAME \
+      ${MARIADB_PASSWORD:+--password $MARIADB_PASSWORD}
   fi
-
-  chown -R $BITNAMI_APP_USER: $BITNAMI_APP_DIR/data || true
 fi
 
 exec /entrypoint.sh "$@"