From 8306f3af7dd9bb138f31fc01367b7ae563fb895b Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sun, 24 Sep 2023 23:27:29 +0200 Subject: [PATCH] [bitnami/mongodb-sharded] Release 6.0.10-debian-11-r10 (#49769) Signed-off-by: Bitnami Containers --- bitnami/mongodb-sharded/6.0/debian-11/Dockerfile | 4 ++-- .../debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh | 10 ++++++++-- bitnami/mongodb-sharded/6.0/debian-11/tags-info.yaml | 1 - 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/bitnami/mongodb-sharded/6.0/debian-11/Dockerfile b/bitnami/mongodb-sharded/6.0/debian-11/Dockerfile index 8f2106874f6d..46bbe37e50ec 100644 --- a/bitnami/mongodb-sharded/6.0/debian-11/Dockerfile +++ b/bitnami/mongodb-sharded/6.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-09-21T20:18:45Z" \ + org.opencontainers.image.created="2023-09-23T21:09:40Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="6.0.10-debian-11-r8" \ + org.opencontainers.image.ref.name="6.0.10-debian-11-r10" \ org.opencontainers.image.title="mongodb-sharded" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="6.0.10" diff --git a/bitnami/mongodb-sharded/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh b/bitnami/mongodb-sharded/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh index e613c77550f2..4e6dc8c989b0 100644 --- a/bitnami/mongodb-sharded/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh +++ b/bitnami/mongodb-sharded/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh @@ -488,9 +488,15 @@ mongodb_set_journal_conf() { local mongodb_conf if ! mongodb_is_file_external "$conf_file_name"; then - if [[ -n "$MONGODB_ENABLE_JOURNAL" ]]; then - mongodb_conf="$(sed -E "/^ *journal:/,/^ *[^:]*:/s/enabled:.*/enabled: $({ is_boolean_yes "$MONGODB_ENABLE_JOURNAL" && echo 'true'; } || echo 'false')/" "$conf_file_path")" + # Disable journal.enabled since it is not supported from 7.0 on + if [[ "$(mongodb_get_version)" =~ ^7\..\. ]]; then + mongodb_conf="$(sed '/journal:/,/enabled: .*/d' "$conf_file_path")" echo "$mongodb_conf" >"$conf_file_path" + else + if [[ -n "$MONGODB_ENABLE_JOURNAL" ]]; then + mongodb_conf="$(sed -E "/^ *journal:/,/^ *[^:]*:/s/enabled:.*/enabled: $({ is_boolean_yes "$MONGODB_ENABLE_JOURNAL" && echo 'true'; } || echo 'false')/" "$conf_file_path")" + echo "$mongodb_conf" >"$conf_file_path" + fi fi else debug "$conf_file_name mounted. Skipping setting log settings" diff --git a/bitnami/mongodb-sharded/6.0/debian-11/tags-info.yaml b/bitnami/mongodb-sharded/6.0/debian-11/tags-info.yaml index c83f0556390c..2a53802639a4 100644 --- a/bitnami/mongodb-sharded/6.0/debian-11/tags-info.yaml +++ b/bitnami/mongodb-sharded/6.0/debian-11/tags-info.yaml @@ -2,4 +2,3 @@ rolling-tags: - "6.0" - 6.0-debian-11 - 6.0.10 -- latest