From dd962fc2d4a8dd6493f69260df2192d43359e3be Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Wed, 1 May 2019 10:46:08 +0000
Subject: [PATCH] 2019.4.23-debian-9-r2 release

---
 bitnami/minio/2019/debian-9/Dockerfile        |  2 +-
 .../minio/2019/debian-9/rootfs/libminio.sh    | 39 +++++++++++++++++++
 bitnami/minio/2019/debian-9/rootfs/prepare.sh |  4 +-
 bitnami/minio/2019/debian-9/rootfs/setup.sh   |  2 +
 bitnami/minio/README.md                       |  2 +-
 5 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/bitnami/minio/2019/debian-9/Dockerfile b/bitnami/minio/2019/debian-9/Dockerfile
index 064d9033389b..5eae5b11637f 100644
--- a/bitnami/minio/2019/debian-9/Dockerfile
+++ b/bitnami/minio/2019/debian-9/Dockerfile
@@ -15,7 +15,7 @@ RUN . ./libcomponent.sh && component_unpack "minio" "2019.4.23-0" --checksum c52
 COPY rootfs /
 RUN /prepare.sh
 ENV BITNAMI_APP_NAME="minio" \
-    BITNAMI_IMAGE_VERSION="2019.4.23-debian-9-r1" \
+    BITNAMI_IMAGE_VERSION="2019.4.23-debian-9-r2" \
     NAMI_PREFIX="/.nami" \
     PATH="/opt/bitnami/minio-client/bin:/opt/bitnami/minio/bin:$PATH"
 
diff --git a/bitnami/minio/2019/debian-9/rootfs/libminio.sh b/bitnami/minio/2019/debian-9/rootfs/libminio.sh
index c799dfa35191..e4ec14b6439a 100644
--- a/bitnami/minio/2019/debian-9/rootfs/libminio.sh
+++ b/bitnami/minio/2019/debian-9/rootfs/libminio.sh
@@ -26,15 +26,35 @@ minio_env() {
     cat <<"EOF"
 export MINIO_BASEDIR="/opt/bitnami/minio"
 export MINIO_LOGDIR="${MINIO_BASEDIR}/log"
+export MINIO_SECRETSDIR="${MINIO_BASEDIR}/secrets"
 export MINIO_DATADIR="/data"
 export MINIO_CERTSDIR="/certs"
 export MINIO_SKIP_CLIENT="${MINIO_SKIP_CLIENT:-no}"
 export MINIO_DISTRIBUTED_MODE_ENABLED="${MINIO_DISTRIBUTED_MODE_ENABLED:-no}"
+export MINIO_DEFAULT_BUCKETS="${MINIO_DEFAULT_BUCKETS:-}"
 export MINIO_PORT_NUMBER="${MINIO_PORT_NUMBER:-9000}"
 export MINIO_DAEMON_USER="minio"
 export MINIO_DAEMON_GROUP="minio"
 export PATH="${MINIO_BASEDIR}/bin:$PATH"
 EOF
+    if [[ -n "${MINIO_ACCESS_KEY_FILE:-}" ]]; then
+        cat <<"EOF"
+export MINIO_ACCESS_KEY="$(< "${MINIO_ACCESS_KEY_FILE}")"
+EOF
+    else
+        cat <<"EOF"
+export MINIO_ACCESS_KEY="${MINIO_ACCESS_KEY:-}"
+EOF
+    fi
+    if [[ -n "${MINIO_SECRET_KEY_FILE:-}" ]]; then
+        cat <<"EOF"
+export MINIO_SECRET_KEY="$(< "${MINIO_SECRET_KEY_FILE}")"
+EOF
+    else
+        cat <<"EOF"
+export MINIO_SECRET_KEY="${MINIO_SECRET_KEY:-}"
+EOF
+    fi
 }
 
 ########################
@@ -175,3 +195,22 @@ minio_validate() {
         fi
     fi
 }
+
+########################
+# Create default buckets
+# Globals:
+#   MINIO_DEFAULT_BUCKETS
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+minio_create_default_buckets() {
+    if [[ -n "$MINIO_DEFAULT_BUCKETS" ]]; then
+        read -r -a buckets <<< "$(tr ',;' ' ' <<< "${MINIO_DEFAULT_BUCKETS}")"
+        info "Creating default buckets..."
+        for b in "${buckets[@]}"; do
+            minio_client_execute mb "local/${b}"
+        done
+    fi
+}
diff --git a/bitnami/minio/2019/debian-9/rootfs/prepare.sh b/bitnami/minio/2019/debian-9/rootfs/prepare.sh
index 387bd76be9fa..98e9eb88d068 100755
--- a/bitnami/minio/2019/debian-9/rootfs/prepare.sh
+++ b/bitnami/minio/2019/debian-9/rootfs/prepare.sh
@@ -10,12 +10,12 @@
 eval "$(minio_env)"
 
 # Ensure non-root user has write permissions on a set of directories
-for dir in "$MINIO_DATADIR" "$MINIO_CERTSDIR" "$MINIO_LOGDIR"; do
+for dir in "$MINIO_DATADIR" "$MINIO_CERTSDIR" "$MINIO_LOGDIR" "$MINIO_SECRETSDIR"; do
     ensure_dir_exists "$dir"
 done
 # Redirect all logging to stdout/stderr
 ln -sf /dev/stdout "$MINIO_LOGDIR/minio-http.log"
-chmod -R g+rwX "$MINIO_DATADIR" "$MINIO_CERTSDIR" "$MINIO_LOGDIR"
+chmod -R g+rwX "$MINIO_DATADIR" "$MINIO_CERTSDIR" "$MINIO_LOGDIR" "$MINIO_SECRETSDIR"
 
 # Load MinIO Client environment variables
 eval "$(minio_client_env)"
diff --git a/bitnami/minio/2019/debian-9/rootfs/setup.sh b/bitnami/minio/2019/debian-9/rootfs/setup.sh
index 3d2dc568e55c..689e013da29f 100755
--- a/bitnami/minio/2019/debian-9/rootfs/setup.sh
+++ b/bitnami/minio/2019/debian-9/rootfs/setup.sh
@@ -33,4 +33,6 @@ else
         # Wait for other clients (distribute mode)
         sleep 5
     fi
+    # Create default buckets
+    minio_create_default_buckets
 fi
diff --git a/bitnami/minio/README.md b/bitnami/minio/README.md
index 1fe071936706..f91ee837f1b1 100644
--- a/bitnami/minio/README.md
+++ b/bitnami/minio/README.md
@@ -43,7 +43,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`2019-ol-7`, `2019.4.23-ol-7-r2` (2019/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-minio/blob/2019.4.23-ol-7-r2/2019/ol-7/Dockerfile)
-* [`2019-debian-9`, `2019.4.23-debian-9-r1`, `2019`, `2019.4.23`, `2019.4.23-r1`, `latest` (2019/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-minio/blob/2019.4.23-debian-9-r1/2019/debian-9/Dockerfile)
+* [`2019-debian-9`, `2019.4.23-debian-9-r2`, `2019`, `2019.4.23`, `2019.4.23-r2`, `latest` (2019/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-minio/blob/2019.4.23-debian-9-r2/2019/debian-9/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/minio GitHub repo](https://github.com/bitnami/bitnami-docker-minio).