From d3b798632f822bb8e6cab802d968edf9d1900328 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Mon, 13 Feb 2017 17:55:04 +0530
Subject: [PATCH] config: move default config var to Dockerfile

---
 bitnami/mariadb/Dockerfile               | 31 ++++++++++++------------
 bitnami/mariadb/rootfs/app-entrypoint.sh | 14 -----------
 2 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/bitnami/mariadb/Dockerfile b/bitnami/mariadb/Dockerfile
index aa890bceb7e5..7e123f83f6ef 100644
--- a/bitnami/mariadb/Dockerfile
+++ b/bitnami/mariadb/Dockerfile
@@ -1,21 +1,7 @@
-## BUILDING
-##   (from project root directory)
-##   $ docker build -t ubuntu-for-bitnami-bitnami-docker-mariadb .
-##
-## RUNNING
-##   $ docker run ubuntu-for-bitnami-bitnami-docker-mariadb
-
 FROM gcr.io/stacksmith-images/minideb:jessie-r8
 
 MAINTAINER Bitnami <containers@bitnami.com>
 
-ENV STACKSMITH_STACK_ID="nd6ziiq" \
-    STACKSMITH_STACK_NAME="Ubuntu for bitnami/bitnami-docker-mariadb" \
-    STACKSMITH_STACK_PRIVATE="1"
-
-## STACKSMITH-END: Modifications below this line will be unchanged when regenerating
-
-
 ENV BITNAMI_IMAGE_VERSION=10.1.21-r0 \
     BITNAMI_APP_NAME=mariadb \
     BITNAMI_APP_USER=mysql
@@ -26,11 +12,24 @@ RUN install_packages libc6 libaio1 zlib1g libjemalloc1 libssl1.0.0 libstdc++6 li
 # Install mariadb
 RUN bitnami-pkg unpack mariadb-10.1.21-0 --checksum ecf191e709c35881b69ff5aea22da984b6d05d4b751a0d5a72fa74bb02b71eea
 
-ENV PATH=/opt/bitnami/$BITNAMI_APP_NAME/sbin:/opt/bitnami/$BITNAMI_APP_NAME/bin:$PATH
+ENV PATH=/opt/bitnami/mariadb/sbin:/opt/bitnami/mariadb/bin:$PATH
 
 COPY rootfs /
 
-VOLUME ["/bitnami/$BITNAMI_APP_NAME"]
+ENV MARIADB_ROOT_PASSWORD= \
+    MARIADB_USER= \
+    MARIADB_PASSWORD= \
+    MARIADB_DATABASE= \
+    MARIADB_PORT= \
+    MARIADB_REPLICATION_MODE= \
+    MARIADB_REPLICATION_USER= \
+    MARIADB_REPLICATION_PASSWORD= \
+    MARIADB_MASTER_HOST= \
+    MARIADB_MASTER_PORT=3306 \
+    MARIADB_MASTER_USER=root \
+    MARIADB_MASTER_PASSWORD=
+
+VOLUME ["/bitnami/mariadb"]
 
 EXPOSE 3306
 
diff --git a/bitnami/mariadb/rootfs/app-entrypoint.sh b/bitnami/mariadb/rootfs/app-entrypoint.sh
index 78df97ecf5c7..565f56e81b2a 100755
--- a/bitnami/mariadb/rootfs/app-entrypoint.sh
+++ b/bitnami/mariadb/rootfs/app-entrypoint.sh
@@ -13,20 +13,6 @@ function initialize {
     fi
 }
 
-# Set default values
-export MARIADB_ROOT_PASSWORD=${MARIADB_ROOT_PASSWORD:-}
-export MARIADB_USER=${MARIADB_USER:-}
-export MARIADB_PASSWORD=${MARIADB_PASSWORD:-}
-export MARIADB_DATABASE=${MARIADB_DATABASE:-}
-export MARIADB_PORT=${MARIADB_PORT:-}
-export MARIADB_REPLICATION_MODE=${MARIADB_REPLICATION_MODE:-}
-export MARIADB_REPLICATION_USER=${MARIADB_REPLICATION_USER:-}
-export MARIADB_REPLICATION_PASSWORD=${MARIADB_REPLICATION_PASSWORD:-}
-export MARIADB_MASTER_HOST=${MARIADB_MASTER_HOST:-}
-export MARIADB_MASTER_PORT=${MARIADB_MASTER_PORT:-3306}
-export MARIADB_MASTER_USER=${MARIADB_MASTER_USER:-root}
-export MARIADB_MASTER_PASSWORD=${MARIADB_MASTER_PASSWORD:-}
-
 if [[ "$1" == "nami" && "$2" == "start" ]] ||  [[ "$1" == "/init.sh" ]]; then
     initialize mariadb
     echo "Starting application ..."