diff --git a/bitnami/mongodb/5.0/debian-11/Dockerfile b/bitnami/mongodb/5.0/debian-11/Dockerfile index 0714cbb98776..b324349d47f6 100644 --- a/bitnami/mongodb/5.0/debian-11/Dockerfile +++ b/bitnami/mongodb/5.0/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-07-31T02:23:25Z" \ + org.opencontainers.image.created="2023-08-03T04:37:17Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.0.19-debian-11-r16" \ + org.opencontainers.image.ref.name="5.0.19-debian-11-r19" \ org.opencontainers.image.title="mongodb" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="5.0.19" @@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libbrotli1 libcom-err2 libcurl4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libtasn1-6 libunistring2 numactl procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "mongodb-shell-1.10.2-0-linux-${OS_ARCH}-debian-11" \ + "mongodb-shell-1.10.3-0-linux-${OS_ARCH}-debian-11" \ "yq-4.34.2-1-linux-${OS_ARCH}-debian-11" \ "wait-for-port-1.0.6-11-linux-${OS_ARCH}-debian-11" \ "render-template-1.0.5-10-linux-${OS_ARCH}-debian-11" \ diff --git a/bitnami/mongodb/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mongodb/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 5f0533467ce8..04867122e497 100644 --- a/bitnami/mongodb/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mongodb/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,7 +9,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.10.2-0" + "version": "1.10.3-0" }, "render-template": { "arch": "amd64", diff --git a/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh b/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh index d138b084a596..0f8914ecbf31 100644 --- a/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh +++ b/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh @@ -1397,15 +1397,6 @@ mongodb_initialize() { mongodb_set_storage_conf "$MONGODB_CONF_FILE" is_boolean_yes "$MONGODB_DISABLE_JAVASCRIPT" && mongodb_disable_javascript_conf "$MONGODB_CONF_FILE" - # Create the ReplicaSet keyFile before Mongo starts in case it is referenced in the $MONGODB_CONF_FILE - 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_CONF_FILE" - fi - mongodb_set_replicasetmode_conf "$MONGODB_CONF_FILE" - fi - if is_dir_empty "$MONGODB_DATA_DIR/db"; then info "Deploying MongoDB from scratch..." ensure_dir_exists "$MONGODB_DATA_DIR/db" @@ -1414,6 +1405,11 @@ mongodb_initialize() { 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_CONF_FILE" + fi + mongodb_set_replicasetmode_conf "$MONGODB_CONF_FILE" mongodb_set_listen_all_conf "$MONGODB_CONF_FILE" mongodb_configure_replica_set fi @@ -1422,8 +1418,15 @@ mongodb_initialize() { else mongodb_set_auth_conf "$MONGODB_CONF_FILE" info "Deploying MongoDB with persisted data..." - if [[ -n "$MONGODB_REPLICA_SET_MODE" ]] && [[ "$MONGODB_REPLICA_SET_MODE" = "dynamic" ]]; then - mongodb_ensure_dynamic_mode_consistency + 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_CONF_FILE" + fi + if [[ "$MONGODB_REPLICA_SET_MODE" = "dynamic" ]]; then + mongodb_ensure_dynamic_mode_consistency + fi + mongodb_set_replicasetmode_conf "$MONGODB_CONF_FILE" fi fi