From 3c4e2a8f4f27a018b3cbe1da3fb07aa2f8850d07 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Tue, 31 May 2016 11:57:28 +0530
Subject: [PATCH] upgrade to `mongodb-3.2.6-1`

---
 bitnami/mongodb/Dockerfile               | 19 ++++++-------------
 bitnami/mongodb/rootfs/app-entrypoint.sh |  7 ++++---
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/bitnami/mongodb/Dockerfile b/bitnami/mongodb/Dockerfile
index ef0f16457783..02cddd15930b 100644
--- a/bitnami/mongodb/Dockerfile
+++ b/bitnami/mongodb/Dockerfile
@@ -1,24 +1,17 @@
-FROM gcr.io/stacksmith-images/ubuntu:14.04-r05
+FROM gcr.io/stacksmith-images/ubuntu:14.04-r07
 MAINTAINER Bitnami <containers@bitnami.com>
 
-ENV BITNAMI_APP_NAME=mongodb \
-    BITNAMI_APP_VERSION=3.2.1-1 \
-    BITNAMI_APP_CHECKSUM=e44c4f6f1cd2142cf67190e69e92ad76167b7d371e0a9dcc00b148965da394cd \
+ENV BITNAMI_IMAGE_VERSION=3.2.6-r0 \
+    BITNAMI_APP_NAME=mongodb \
     BITNAMI_APP_USER=mongo
 
-# Install supporting modules
-RUN bitnami-pkg install base-functions-1.0.0-2 --checksum 9789082a1e01a4411198136477723288736d5ad5990403a208423b39369c8aac
-
-# Install application
-RUN bitnami-pkg unpack $BITNAMI_APP_NAME-$BITNAMI_APP_VERSION --checksum $BITNAMI_APP_CHECKSUM
+RUN bitnami-pkg unpack mongodb-3.2.6-1 --checksum 4154860dd1fece22f99f859466b6d0c3f5384cce84d51343953d3ebb9fa2dabd
 ENV PATH=/opt/bitnami/$BITNAMI_APP_NAME/sbin:/opt/bitnami/$BITNAMI_APP_NAME/bin:$PATH
 
-# Setting entry point
 COPY rootfs/ /
 ENTRYPOINT ["/app-entrypoint.sh"]
 CMD ["harpoon", "start", "--foreground", "mongodb"]
 
-# Exposing ports
-EXPOSE 27017
-
 VOLUME ["/bitnami/$BITNAMI_APP_NAME"]
+
+EXPOSE 27017
diff --git a/bitnami/mongodb/rootfs/app-entrypoint.sh b/bitnami/mongodb/rootfs/app-entrypoint.sh
index cddd5775a87e..e76997d4c379 100755
--- a/bitnami/mongodb/rootfs/app-entrypoint.sh
+++ b/bitnami/mongodb/rootfs/app-entrypoint.sh
@@ -5,11 +5,12 @@ if [[ "$1" == "harpoon" && "$2" == "start" ]]; then
   status=`harpoon inspect $BITNAMI_APP_NAME`
   if [[ "$status" == *'"lifecycle": "unpacked"'* ]]; then
     harpoon initialize $BITNAMI_APP_NAME \
+      ${MONGODB_ROOT_PASSWORD:+--rootPassword $MONGODB_ROOT_PASSWORD} \
       ${MONGODB_USER:+--username $MONGODB_USER} \
-      ${MONGODB_PASSWORD:+--password $MONGODB_PASSWORD}
+      ${MONGODB_PASSWORD:+--password $MONGODB_PASSWORD} \
+      ${MONGODB_DATABASE:+--database $MONGODB_DATABASE}
   fi
+  chown $BITNAMI_APP_USER: /bitnami/$BITNAMI_APP_NAME || true
 fi
 
-chown $BITNAMI_APP_USER: /bitnami/$BITNAMI_APP_NAME || true
-
 exec /entrypoint.sh "$@"