From 8c1cf736f3cd80acc75b0a78c08ce22e888f67c4 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 19 Feb 2024 13:17:03 +0100 Subject: [PATCH] [bitnami/mongodb-sharded] Release 5.0.24-debian-11-r20 (#62077) Signed-off-by: Bitnami Containers --- bitnami/mongodb-sharded/5.0/debian-11/Dockerfile | 6 +++--- .../prebuildfs/opt/bitnami/.bitnami_components.json | 2 +- .../5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-env.sh | 1 + .../opt/bitnami/scripts/mongodb-sharded/entrypoint.sh | 6 ++++++ .../opt/bitnami/scripts/mongodb-sharded/postunpack.sh | 5 ++++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/bitnami/mongodb-sharded/5.0/debian-11/Dockerfile b/bitnami/mongodb-sharded/5.0/debian-11/Dockerfile index 416cf656915c..2fb058ad6a84 100644 --- a/bitnami/mongodb-sharded/5.0/debian-11/Dockerfile +++ b/bitnami/mongodb-sharded/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:01:16Z" \ + org.opencontainers.image.created="2024-02-19T09:53:54Z" \ 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-r19" \ + org.opencontainers.image.ref.name="5.0.24-debian-11-r20" \ org.opencontainers.image.title="mongodb-sharded" \ 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-sharded/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mongodb-sharded/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index caa2408514a2..f638757485ff 100644 --- a/bitnami/mongodb-sharded/5.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mongodb-sharded/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-sharded/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-env.sh b/bitnami/mongodb-sharded/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-env.sh index 12ce7d5c2b2a..0f0ed9ffbc53 100644 --- a/bitnami/mongodb-sharded/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-env.sh +++ b/bitnami/mongodb-sharded/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-env.sh @@ -91,6 +91,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-sharded/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-sharded/entrypoint.sh b/bitnami/mongodb-sharded/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-sharded/entrypoint.sh index 7e71dfb22f11..7fd6d7673442 100755 --- a/bitnami/mongodb-sharded/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-sharded/entrypoint.sh +++ b/bitnami/mongodb-sharded/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-sharded/entrypoint.sh @@ -19,6 +19,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 $MONGODB_CONF_DIR" +cp -nr "$MONGODB_DEFAULT_CONF_DIR"/. "$MONGODB_CONF_DIR" + if [[ "$*" = *"/opt/bitnami/scripts/mongodb-sharded/run.sh"* || "$*" = *"/run.sh"* ]]; then info "** Starting MongoDB Sharded setup **" /opt/bitnami/scripts/mongodb-sharded/setup.sh diff --git a/bitnami/mongodb-sharded/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-sharded/postunpack.sh b/bitnami/mongodb-sharded/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-sharded/postunpack.sh index 5d9efaadfab6..f1fb57f616d9 100755 --- a/bitnami/mongodb-sharded/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-sharded/postunpack.sh +++ b/bitnami/mongodb-sharded/5.0/debian-11/rootfs/opt/bitnami/scripts/mongodb-sharded/postunpack.sh @@ -18,7 +18,7 @@ set -o pipefail # Load environment . /opt/bitnami/scripts/mongodb-env.sh -for dir in "$MONGODB_TMP_DIR" "$MONGODB_LOG_DIR" "$MONGODB_CONF_DIR" "$MONGODB_DATA_DIR" "$MONGODB_VOLUME_DIR" "$MONGODB_INITSCRIPTS_DIR"; do +for dir in "$MONGODB_TMP_DIR" "$MONGODB_LOG_DIR" "$MONGODB_CONF_DIR" "$MONGODB_DEFAULT_CONF_DIR" "$MONGODB_DATA_DIR" "$MONGODB_VOLUME_DIR" "$MONGODB_INITSCRIPTS_DIR"; do ensure_dir_exists "$dir" done chmod -R g+rwX "$MONGODB_TMP_DIR" "$MONGODB_LOG_DIR" "$MONGODB_CONF_DIR" "$MONGODB_DATA_DIR" "$MONGODB_VOLUME_DIR" "$MONGODB_INITSCRIPTS_DIR" @@ -38,3 +38,6 @@ chmod g+w "$MONGODB_CONF_FILE" chmod g+w "$MONGODB_MONGOS_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