From 5e57bf41895da63704f4055c8b6845c7910cd8e9 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 6 Aug 2019 05:43:31 +0000 Subject: [PATCH] 3.6.13-debian-9-r65 release --- bitnami/mongodb/3.6/debian-9/Dockerfile | 4 +-- .../mongodb/3.6/debian-9/rootfs/libmongodb.sh | 30 ++++++------------- bitnami/mongodb/3.6/debian-9/rootfs/run.sh | 2 +- bitnami/mongodb/README.md | 4 +-- 4 files changed, 14 insertions(+), 26 deletions(-) diff --git a/bitnami/mongodb/3.6/debian-9/Dockerfile b/bitnami/mongodb/3.6/debian-9/Dockerfile index c0cfad4082db..2107c033db96 100644 --- a/bitnami/mongodb/3.6/debian-9/Dockerfile +++ b/bitnami/mongodb/3.6/debian-9/Dockerfile @@ -1,4 +1,4 @@ -FROM bitnami/minideb-extras-base:stretch-r321 +FROM bitnami/minideb-extras-base:stretch-r322 LABEL maintainer "Bitnami " ENV BITNAMI_PKG_CHMOD="-R g+rwX" \ @@ -14,7 +14,7 @@ RUN . ./libcomponent.sh && component_unpack "mongodb" "3.6.13-4" --checksum 97ae COPY rootfs / RUN /postunpack.sh ENV BITNAMI_APP_NAME="mongodb" \ - BITNAMI_IMAGE_VERSION="3.6.13-debian-9-r64" \ + BITNAMI_IMAGE_VERSION="3.6.13-debian-9-r65" \ MONGODB_ADVERTISED_HOSTNAME="" \ MONGODB_DATABASE="" \ MONGODB_DISABLE_SYSTEM_LOG="no" \ diff --git a/bitnami/mongodb/3.6/debian-9/rootfs/libmongodb.sh b/bitnami/mongodb/3.6/debian-9/rootfs/libmongodb.sh index ef3821a28495..fc2e83ff1bbc 100644 --- a/bitnami/mongodb/3.6/debian-9/rootfs/libmongodb.sh +++ b/bitnami/mongodb/3.6/debian-9/rootfs/libmongodb.sh @@ -57,8 +57,6 @@ export MONGODB_REPLICA_SET_KEY="${MONGODB_REPLICA_SET_KEY:-}" export MONGODB_REPLICA_SET_NAME="${MONGODB_REPLICA_SET_NAME:-replicaset}" export MONGODB_ENABLE_MAJORITY_READ="${MONGODB_ENABLE_MAJORITY_READ:-yes}" export ALLOW_EMPTY_PASSWORD="${ALLOW_EMPTY_PASSWORD:-no}" -export MONGODB_EXTRA_FLAGS="${MONGODB_EXTRA_FLAGS:-}" -export MONGODB_CLIENT_EXTRA_FLAGS="${MONGODB_CLIENT_EXTRA_FLAGS:-}" EOF } @@ -162,7 +160,7 @@ mongodb_create_config() { # $1 - User to run queries # $2 - Password # $3 - Database where to run the queries -# $4 - Host (default to result of get_mongo_hostname function) +# $4 - Host (default 127.0.0.1) # $5 - Port (default $MONGODB_PORT_NUMBER) # Returns: # None @@ -171,9 +169,8 @@ mongodb_execute() { local user="${1:-}" local password="${2:-}" local database="${3:-}" - local host="${4:-$(get_mongo_hostname)}" + local host="${4:-127.0.0.1}" local port="${5:-$MONGODB_PORT_NUMBER}" - local extra_args="$MONGODB_CLIENT_EXTRA_FLAGS" local result # If password is empty it means no auth, do not specify user @@ -182,21 +179,11 @@ mongodb_execute() { local -a args=("--host" "$host" "--port" "$port") [[ -n "$user" ]] && args+=("-u" "$user") [[ -n "$password" ]] && args+=("-p" "$password") - [[ -n "$extra_args" ]] && args+=($extra_args) [[ -n "$database" ]] && args+=("$database") "$MONGODB_BIN_DIR/mongo" "${args[@]}" } -######################## -# Determine the hostname by which to contact the locally running mongo daemon -# Returns: -# The value of $MONGODB_ADVERTISED_HOSTNAME or the current host address -######################## -get_mongo_hostname() { - [[ -n "$MONGODB_ADVERTISED_HOSTNAME" ]] && echo "$MONGODB_ADVERTISED_HOSTNAME" || echo $(get_machine_ip) -} - ######################## # Drop local Database # Globals: @@ -277,7 +264,7 @@ mongodb_start_bg() { # Use '--fork' option to enable daemon mode # ref: https://docs.mongodb.com/manual/reference/program/mongod/#cmdoption-mongod-fork local flags=("--fork" "--config=$MONGODB_CONFIG_FILE") - [[ -z "${MONGODB_EXTRA_FLAGS:-}" ]] || flags+=(${MONGODB_EXTRA_FLAGS}) + [[ -z "${MONGODB_EXTRA_FLAGS:-}" ]] || flags=("${flags[@]}" "${MONGODB_EXTRA_FLAGS[@]}") debug "Starting MongoDB in background..." @@ -410,7 +397,7 @@ mongodb_enable_replicasetmode() { } ######################## -# Creates the appropriate users +# Creates the apropiate users # Globals: # MONGODB_* # Arguments: @@ -485,7 +472,7 @@ mongodb_is_primary_node_initiated() { local node="${1:?node is required}" local result - result=$(mongodb_execute "root" "$MONGODB_ROOT_PASSWORD" "admin" "$node" "$MONGODB_PORT_NUMBER" <