From bf709864c25f2ce5a53a49478e942ba7b0ef93e6 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 8 Apr 2021 13:37:39 +0000 Subject: [PATCH] 4.0.23-debian-9-r46 release --- .../mongodb-sharded/4.0/debian-9/Dockerfile | 2 +- .../prebuildfs/opt/bitnami/scripts/liblog.sh | 2 + .../opt/bitnami/scripts/libversion.sh | 4 +- .../opt/bitnami/scripts/libmongodb-sharded.sh | 4 +- .../rootfs/opt/bitnami/scripts/libmongodb.sh | 39 +++++++++---------- .../scripts/mongodb-sharded/entrypoint.sh | 1 + .../scripts/mongodb-sharded/postunpack.sh | 1 + .../bitnami/scripts/mongodb-sharded/run.sh | 1 + .../bitnami/scripts/mongodb-sharded/setup.sh | 1 + bitnami/mongodb-sharded/README.md | 2 +- 10 files changed, 29 insertions(+), 28 deletions(-) diff --git a/bitnami/mongodb-sharded/4.0/debian-9/Dockerfile b/bitnami/mongodb-sharded/4.0/debian-9/Dockerfile index 89ead92bd743..15a0e828cc8a 100644 --- a/bitnami/mongodb-sharded/4.0/debian-9/Dockerfile +++ b/bitnami/mongodb-sharded/4.0/debian-9/Dockerfile @@ -22,7 +22,7 @@ RUN ln -s /opt/bitnami/scripts/mongodb-sharded/run.sh /run.sh COPY rootfs / RUN /opt/bitnami/scripts/mongodb-sharded/postunpack.sh ENV BITNAMI_APP_NAME="mongodb-sharded" \ - BITNAMI_IMAGE_VERSION="4.0.23-debian-9-r45" \ + BITNAMI_IMAGE_VERSION="4.0.23-debian-9-r46" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/mongodb/bin:$PATH" EXPOSE 27017 diff --git a/bitnami/mongodb-sharded/4.0/debian-9/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/mongodb-sharded/4.0/debian-9/prebuildfs/opt/bitnami/scripts/liblog.sh index 60ec4cbfc32a..c7c0f6d4422a 100644 --- a/bitnami/mongodb-sharded/4.0/debian-9/prebuildfs/opt/bitnami/scripts/liblog.sh +++ b/bitnami/mongodb-sharded/4.0/debian-9/prebuildfs/opt/bitnami/scripts/liblog.sh @@ -106,5 +106,7 @@ indent() { for ((i = 0; i < num; i++)); do indent_unit="${indent_unit}${char}" done + # shellcheck disable=SC2001 + # Complex regex, see https://github.com/koalaman/shellcheck/wiki/SC2001#exceptions echo "$string" | sed "s/^/${indent_unit}/" } diff --git a/bitnami/mongodb-sharded/4.0/debian-9/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/mongodb-sharded/4.0/debian-9/prebuildfs/opt/bitnami/scripts/libversion.sh index 66d4f457bdd2..f3bc7568bfa5 100644 --- a/bitnami/mongodb-sharded/4.0/debian-9/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/mongodb-sharded/4.0/debian-9/prebuildfs/opt/bitnami/scripts/libversion.sh @@ -9,7 +9,7 @@ # Functions ######################## -# Gets semantic version +# Gets semantic version # Arguments: # $1 - version: string to extract major.minor.patch # $2 - section: 1 to extract major, 2 to extract minor, 3 to extract patch @@ -38,7 +38,7 @@ get_sematic_version () { done local number_regex='^[0-9]+$' - if [[ "$section" =~ $number_regex ]] && (( $section > 0 )) && (( $section <= 3 )); then + if [[ "$section" =~ $number_regex ]] && (( section > 0 )) && (( section <= 3 )); then echo "${version_sections[$section]}" return else diff --git a/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/libmongodb-sharded.sh b/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/libmongodb-sharded.sh index 744ad8323fa8..b04ace6e6ff9 100644 --- a/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/libmongodb-sharded.sh +++ b/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/libmongodb-sharded.sh @@ -4,8 +4,6 @@ # Bitnami MongoDB library # shellcheck disable=SC1091 -# shellcheck disable=SC2120 -# shellcheck disable=SC2119 # Load Generic Libraries . /opt/bitnami/scripts/liblog.sh @@ -50,7 +48,7 @@ mongodb_sharded_mongod_initialize() { mongodb_set_net_conf mongodb_set_log_conf mongodb_set_storage_conf - mongodb_sharded_set_sharding_conf + mongodb_sharded_set_sharding_conf "$MONGODB_CONF_FILE" if is_dir_empty "$MONGODB_DATA_DIR/db"; then info "Deploying MongoDB Sharded from scratch..." diff --git a/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/libmongodb.sh b/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/libmongodb.sh index 31fceb2f6321..d64241b4756a 100644 --- a/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/libmongodb.sh +++ b/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/libmongodb.sh @@ -1,11 +1,8 @@ #!/bin/bash - # # Bitnami MongoDB library -# shellcheck disable=SC1091 -# shellcheck disable=SC2120 -# shellcheck disable=SC2119 +# shellcheck disable=SC1090,SC1091 # Load Generic Libraries . /opt/bitnami/scripts/libfile.sh @@ -142,7 +139,7 @@ mongodb_execute() { local -a args=("--host" "$host" "--port" "$port") [[ -n "$final_user" ]] && args+=("-u" "$final_user") [[ -n "$password" ]] && args+=("-p" "$password") - [[ -n "$extra_args" ]] && args+=($extra_args) + [[ -n "$extra_args" ]] && args+=("$extra_args") [[ -n "$database" ]] && args+=("$database") "$MONGODB_BIN_DIR/mongo" "${args[@]}" @@ -225,7 +222,7 @@ is_mongodb_not_running() { ######################### mongodb_restart() { mongodb_stop - mongodb_start_bg + mongodb_start_bg "$MONGODB_CONF_FILE" } ######################## @@ -242,7 +239,7 @@ mongodb_start_bg() { # ref: https://docs.mongodb.com/manual/reference/program/mongod/#cmdoption-mongod-fork local -r conf_file="${1:-$MONGODB_CONF_FILE}" local flags=("--fork" "--config=$conf_file") - [[ -z "${MONGODB_EXTRA_FLAGS:-}" ]] || flags+=(${MONGODB_EXTRA_FLAGS}) + [[ -z "${MONGODB_EXTRA_FLAGS:-}" ]] || flags+=("${MONGODB_EXTRA_FLAGS}") debug "Starting MongoDB in background..." @@ -1050,45 +1047,45 @@ mongodb_initialize() { rm -f "$MONGODB_PID_FILE" mongodb_copy_mounted_config - mongodb_set_net_conf - mongodb_set_log_conf - mongodb_set_storage_conf - is_boolean_yes "$MONGODB_DISABLE_JAVASCRIPT" && mongodb_disable_javascript_conf + mongodb_set_net_conf "$MONGODB_CONF_FILE" + mongodb_set_log_conf "$MONGODB_CONF_FILE" + mongodb_set_storage_conf "$MONGODB_CONF_FILE" + is_boolean_yes "$MONGODB_DISABLE_JAVASCRIPT" && mongodb_disable_javascript_conf "$MONGODB_CONF_FILE" if is_dir_empty "$MONGODB_DATA_DIR/db"; then info "Deploying MongoDB from scratch..." ensure_dir_exists "$MONGODB_DATA_DIR/db" am_i_root && chown -R "$MONGODB_DAEMON_USER" "$MONGODB_DATA_DIR/db" - mongodb_start_bg + mongodb_start_bg "$MONGODB_CONF_FILE" mongodb_create_users if [[ -n "$MONGODB_REPLICA_SET_MODE" ]]; then if [[ -n "$MONGODB_REPLICA_SET_KEY" ]]; then mongodb_create_keyfile "$MONGODB_REPLICA_SET_KEY" - mongodb_set_keyfile_conf + mongodb_set_keyfile_conf "$MONGODB_CONF_FILE" fi - mongodb_set_replicasetmode_conf - mongodb_set_listen_all_conf + mongodb_set_replicasetmode_conf "$MONGODB_CONF_FILE" + mongodb_set_listen_all_conf "$MONGODB_CONF_FILE" mongodb_configure_replica_set fi mongodb_stop else - mongodb_set_auth_conf + mongodb_set_auth_conf "$MONGODB_CONF_FILE" info "Deploying MongoDB with persisted data..." if [[ -n "$MONGODB_REPLICA_SET_MODE" ]]; then if [[ -n "$MONGODB_REPLICA_SET_KEY" ]]; then mongodb_create_keyfile "$MONGODB_REPLICA_SET_KEY" - mongodb_set_keyfile_conf + mongodb_set_keyfile_conf "$MONGODB_CONF_FILE" fi if [[ "$MONGODB_REPLICA_SET_MODE" = "dynamic" ]]; then mongodb_ensure_dynamic_mode_consistency fi - mongodb_set_replicasetmode_conf + mongodb_set_replicasetmode_conf "$MONGODB_CONF_FILE" fi fi - mongodb_set_auth_conf + mongodb_set_auth_conf "$MONGODB_CONF_FILE" } ######################## @@ -1104,7 +1101,7 @@ mongodb_ensure_dynamic_mode_consistency() { if grep -q -E "^[[:space:]]*replSetName: $MONGODB_REPLICA_SET_NAME" "$MONGODB_CONF_FILE"; then info "ReplicaSetMode set to \"dynamic\" and replSetName different from config file." info "Dropping local database ..." - mongodb_start_bg + mongodb_start_bg "$MONGODB_CONF_FILE" mongodb_drop_local_database mongodb_stop fi @@ -1158,7 +1155,7 @@ mongodb_custom_init_scripts() { fi if is_boolean_yes "$run_custom_init_scripts"; then info "Loading user's custom files from $MONGODB_INITSCRIPTS_DIR ..."; - mongodb_start_bg + mongodb_start_bg "$MONGODB_CONF_FILE" local -r tmp_file=/tmp/filelist local mongo_user local mongo_pass diff --git a/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/mongodb-sharded/entrypoint.sh b/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/mongodb-sharded/entrypoint.sh index 6abe40746d94..ee68dbb28be0 100755 --- a/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/mongodb-sharded/entrypoint.sh +++ b/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/mongodb-sharded/entrypoint.sh @@ -1,4 +1,5 @@ #!/bin/bash + # shellcheck disable=SC1091 set -o errexit diff --git a/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/mongodb-sharded/postunpack.sh b/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/mongodb-sharded/postunpack.sh index bb39edba8c7b..4ac4b61cb50c 100755 --- a/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/mongodb-sharded/postunpack.sh +++ b/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/mongodb-sharded/postunpack.sh @@ -1,4 +1,5 @@ #!/bin/bash + # shellcheck disable=SC1091 set -o errexit diff --git a/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/mongodb-sharded/run.sh b/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/mongodb-sharded/run.sh index c87467c7c756..51b6312e2ca6 100755 --- a/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/mongodb-sharded/run.sh +++ b/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/mongodb-sharded/run.sh @@ -1,4 +1,5 @@ #!/bin/bash + # shellcheck disable=SC1091 set -o errexit diff --git a/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/mongodb-sharded/setup.sh b/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/mongodb-sharded/setup.sh index 8101f7cca5d0..07c38437efba 100755 --- a/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/mongodb-sharded/setup.sh +++ b/bitnami/mongodb-sharded/4.0/debian-9/rootfs/opt/bitnami/scripts/mongodb-sharded/setup.sh @@ -1,4 +1,5 @@ #!/bin/bash + # shellcheck disable=SC1091 set -o errexit diff --git a/bitnami/mongodb-sharded/README.md b/bitnami/mongodb-sharded/README.md index 5055f5529ede..5277c1680680 100644 --- a/bitnami/mongodb-sharded/README.md +++ b/bitnami/mongodb-sharded/README.md @@ -50,7 +50,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`4.4`, `4.4-debian-10`, `4.4.5`, `4.4.5-debian-10-r1`, `latest` (4.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/4.4.5-debian-10-r1/4.4/debian-10/Dockerfile) * [`4.2`, `4.2-debian-10`, `4.2.13`, `4.2.13-debian-10-r21` (4.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/4.2.13-debian-10-r21/4.2/debian-10/Dockerfile) -* [`4.0`, `4.0-debian-9`, `4.0.23`, `4.0.23-debian-9-r45` (4.0/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/4.0.23-debian-9-r45/4.0/debian-9/Dockerfile) +* [`4.0`, `4.0-debian-9`, `4.0.23`, `4.0.23-debian-9-r46` (4.0/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/4.0.23-debian-9-r46/4.0/debian-9/Dockerfile) * [`3.6`, `3.6-debian-9`, `3.6.23`, `3.6.23-debian-9-r22` (3.6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/3.6.23-debian-9-r22/3.6/debian-9/Dockerfile) Subscribe to project updates by watching the [bitnami/mongodb GitHub repo](https://github.com/bitnami/bitnami-docker-mongodb).