diff --git a/bitnami/mongodb/5.0/debian-11/Dockerfile b/bitnami/mongodb/5.0/debian-11/Dockerfile index 2e968800e99c..27a708660369 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="2024-02-16T03:00:04Z" \ + org.opencontainers.image.created="2024-02-16T13:55:58Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.0.24-debian-11-r17" \ + org.opencontainers.image.ref.name="5.0.24-debian-11-r18" \ org.opencontainers.image.title="mongodb" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="5.0.24" @@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-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=( \ - "yq-4.40.7-0-linux-${OS_ARCH}-debian-11" \ + "yq-4.41.1-0-linux-${OS_ARCH}-debian-11" \ "wait-for-port-1.0.7-8-linux-${OS_ARCH}-debian-11" \ "render-template-1.0.6-8-linux-${OS_ARCH}-debian-11" \ "mongodb-shell-2.1.4-0-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 caa2408514a2..f638757485ff 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 @@ -27,6 +27,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.40.7-0" + "version": "4.41.1-0" } } \ No newline at end of file diff --git a/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-env.sh b/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-env.sh index 82494e9b9f47..a405241e8dca 100644 --- a/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-env.sh +++ b/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-env.sh @@ -85,6 +85,7 @@ export PATH="$BITNAMI_ROOT_DIR/mongodb/bin:$BITNAMI_ROOT_DIR/common/bin:$PATH" export MONGODB_VOLUME_DIR="$BITNAMI_VOLUME_DIR/mongodb" export MONGODB_BASE_DIR="$BITNAMI_ROOT_DIR/mongodb" export MONGODB_CONF_DIR="$MONGODB_BASE_DIR/conf" +export MONGODB_DEFAULT_CONF_DIR="$MONGODB_BASE_DIR/conf.default" export MONGODB_LOG_DIR="$MONGODB_BASE_DIR/logs" export MONGODB_DATA_DIR="${MONGODB_VOLUME_DIR}/data" export MONGODB_TMP_DIR="$MONGODB_BASE_DIR/tmp" diff --git a/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb/entrypoint.sh b/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb/entrypoint.sh index 15c4e2c6c7f5..a61d6a609d3d 100755 --- a/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb/entrypoint.sh +++ b/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb/entrypoint.sh @@ -18,6 +18,12 @@ set -o pipefail print_welcome_page +# We add the copy from default config in the entrypoint to not break users +# bypassing the setup.sh logic. If the file already exists do not overwrite (in +# case someone mounts a configuration file in /opt/bitnami/mongodb/conf) +debug "Copying files from $MONGODB_DEFAULT_CONF_DIR to $MONOGODB_CONF_DIR" +cp -nr "$MONGODB_DEFAULT_CONF_DIR"/. "$MONGODB_CONF_DIR" + if [[ "$1" = "/opt/bitnami/scripts/mongodb/run.sh" ]]; then info "** Starting MongoDB setup **" /opt/bitnami/scripts/mongodb/setup.sh diff --git a/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb/postunpack.sh b/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb/postunpack.sh index de83a4ea294d..c2d9b0a76df7 100755 --- a/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb/postunpack.sh +++ b/bitnami/mongodb/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb/postunpack.sh @@ -37,3 +37,7 @@ chmod 660 "$MONGODB_CONF_FILE" # Redirect all logging to stdout ln -sf /dev/stdout "$MONGODB_LOG_FILE" + +# Copy all initially generated configuration files to the default directory +# (this is to avoid breaking when entrypoint is being overridden) +cp -r "${MONGODB_CONF_DIR}/"* "$MONGODB_DEFAULT_CONF_DIR" \ No newline at end of file diff --git a/bitnami/mongodb/README.md b/bitnami/mongodb/README.md index 774b3ef5e124..1bd35e057680 100644 --- a/bitnami/mongodb/README.md +++ b/bitnami/mongodb/README.md @@ -192,6 +192,7 @@ docker-compose up -d | `MONGODB_VOLUME_DIR` | Persistence base directory | `$BITNAMI_VOLUME_DIR/mongodb` | | `MONGODB_BASE_DIR` | MongoDB installation directory | `$BITNAMI_ROOT_DIR/mongodb` | | `MONGODB_CONF_DIR` | MongoDB configuration directory | `$MONGODB_BASE_DIR/conf` | +| `MONGODB_DEFAULT_CONF_DIR` | MongoDB default configuration directory | `$MONGODB_BASE_DIR/conf.default` | | `MONGODB_LOG_DIR` | MongoDB logs directory | `$MONGODB_BASE_DIR/logs` | | `MONGODB_DATA_DIR` | MongoDB data directory | `${MONGODB_VOLUME_DIR}/data` | | `MONGODB_TMP_DIR` | MongoDB temporary directory | `$MONGODB_BASE_DIR/tmp` |