Merge pull request #88 from lilian-pouliquen/master

dockhippie · Oct 24, 2023 · 10e6803 · 10e6803
2 parents abc2397 + 278f88b
commit 10e6803
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -40,9 +40,9 @@ MONGODB_CPU = false
 MONGODB_DATABASE =
 MONGODB_DBPATH = /var/lib/mongodb
 MONGODB_DIRECTORYPERDB = false
-MONGODB_ENABLE_FREE_MONITORING = off
+MONGODB_ENABLE_FREE_MONITORING = off # available for versions <= 4.4 only
 MONGODB_ENABLE_MAJORITY_READ_CONCERN = false
-MONGODB_FREE_MONITORING_TAG =
+MONGODB_FREE_MONITORING_TAG = # available for versions <= 4.4 only
 MONGODB_IPV6 = false
 MONGODB_JOURNAL_COMMIT_INTERVAL =
 MONGODB_JOURNAL_OPTIONS =  # available for versions <= 4.0 only

diff --git a/v5.0/overlay/etc/entrypoint.d/05-base.sh b/v5.0/overlay/etc/entrypoint.d/05-base.sh
@@ -156,12 +156,6 @@ declare -x MONGODB_WIRED_TIGER_INDEX_PREFIX_COMPRESSION
 declare -x MONGODB_AWS_IAM_SESSION_TOKEN
 [[ -z "${MONGODB_AWS_IAM_SESSION_TOKEN}" ]] && MONGODB_AWS_IAM_SESSION_TOKEN=""
 
-declare -x MONGODB_ENABLE_FREE_MONITORING
-[[ -z "${MONGODB_ENABLE_FREE_MONITORING}" ]] && MONGODB_ENABLE_FREE_MONITORING="off"
-
-declare -x MONGODB_FREE_MONITORING_TAG
-[[ -z "${MONGODB_FREE_MONITORING_TAG}" ]] && MONGODB_FREE_MONITORING_TAG=""
-
 declare -x MONGODB_SSL_ON_NORMAL_PORTS
 [[ -z "${MONGODB_SSL_ON_NORMAL_PORTS}" ]] && MONGODB_SSL_ON_NORMAL_PORTS="false"
 

diff --git a/v5.0/overlay/usr/bin/container b/v5.0/overlay/usr/bin/container
@@ -53,8 +53,6 @@ pushd ${MONGODB_DBPATH} >/dev/null
     [[ -n "${MONGODB_WIRED_TIGER_COLLECTION_BLOCK_COMPRESSOR}" ]] && STARTCMD="${STARTCMD} --wiredTigerCollectionBlockCompressor ${MONGODB_WIRED_TIGER_COLLECTION_BLOCK_COMPRESSOR}"
     [[ -n "${MONGODB_WIRED_TIGER_INDEX_PREFIX_COMPRESSION}" ]] && STARTCMD="${STARTCMD} --wiredTigerIndexPrefixCompression ${MONGODB_WIRED_TIGER_INDEX_PREFIX_COMPRESSION}"
     [[ -n "${MONGODB_AWS_IAM_SESSION_TOKEN}" ]] && STARTCMD="${STARTCMD} --awsIamSessionToken ${MONGODB_AWS_IAM_SESSION_TOKEN}"
-    [[ -n "${MONGODB_ENABLE_FREE_MONITORING}" ]] && STARTCMD="${STARTCMD} --enableFreeMonitoring ${MONGODB_ENABLE_FREE_MONITORING}"
-    [[ -n "${MONGODB_FREE_MONITORING_TAG}" ]] && STARTCMD="${STARTCMD} --freeMonitoringTag ${MONGODB_FREE_MONITORING_TAG}"
     [[ "${MONGODB_SSL_ON_NORMAL_PORTS}" == "true" || "${MONGODB_SSL_ON_NORMAL_PORTS}" == "1" ]] && STARTCMD="${STARTCMD} --tlsOnNormalPorts"
     [[ -n "${MONGODB_SSL_MODE}" ]] && STARTCMD="${STARTCMD} --tlsMode ${MONGODB_SSL_MODE}"
     [[ -n "${MONGODB_SSL_CERTIFICATE_KEY_FILE}" ]] && STARTCMD="${STARTCMD} --tlsCertificateKeyFile ${MONGODB_SSL_CERTIFICATE_KEY_FILE}"

diff --git a/v6.0/overlay/etc/entrypoint.d/05-base.sh b/v6.0/overlay/etc/entrypoint.d/05-base.sh
@@ -156,12 +156,6 @@ declare -x MONGODB_WIRED_TIGER_INDEX_PREFIX_COMPRESSION
 declare -x MONGODB_AWS_IAM_SESSION_TOKEN
 [[ -z "${MONGODB_AWS_IAM_SESSION_TOKEN}" ]] && MONGODB_AWS_IAM_SESSION_TOKEN=""
 
-declare -x MONGODB_ENABLE_FREE_MONITORING
-[[ -z "${MONGODB_ENABLE_FREE_MONITORING}" ]] && MONGODB_ENABLE_FREE_MONITORING="off"
-
-declare -x MONGODB_FREE_MONITORING_TAG
-[[ -z "${MONGODB_FREE_MONITORING_TAG}" ]] && MONGODB_FREE_MONITORING_TAG=""
-
 declare -x MONGODB_SSL_ON_NORMAL_PORTS
 [[ -z "${MONGODB_SSL_ON_NORMAL_PORTS}" ]] && MONGODB_SSL_ON_NORMAL_PORTS="false"
 

diff --git a/v6.0/overlay/usr/bin/container b/v6.0/overlay/usr/bin/container
@@ -53,8 +53,6 @@ pushd ${MONGODB_DBPATH} >/dev/null
     [[ -n "${MONGODB_WIRED_TIGER_COLLECTION_BLOCK_COMPRESSOR}" ]] && STARTCMD="${STARTCMD} --wiredTigerCollectionBlockCompressor ${MONGODB_WIRED_TIGER_COLLECTION_BLOCK_COMPRESSOR}"
     [[ -n "${MONGODB_WIRED_TIGER_INDEX_PREFIX_COMPRESSION}" ]] && STARTCMD="${STARTCMD} --wiredTigerIndexPrefixCompression ${MONGODB_WIRED_TIGER_INDEX_PREFIX_COMPRESSION}"
     [[ -n "${MONGODB_AWS_IAM_SESSION_TOKEN}" ]] && STARTCMD="${STARTCMD} --awsIamSessionToken ${MONGODB_AWS_IAM_SESSION_TOKEN}"
-    [[ -n "${MONGODB_ENABLE_FREE_MONITORING}" ]] && STARTCMD="${STARTCMD} --enableFreeMonitoring ${MONGODB_ENABLE_FREE_MONITORING}"
-    [[ -n "${MONGODB_FREE_MONITORING_TAG}" ]] && STARTCMD="${STARTCMD} --freeMonitoringTag ${MONGODB_FREE_MONITORING_TAG}"
     [[ "${MONGODB_SSL_ON_NORMAL_PORTS}" == "true" || "${MONGODB_SSL_ON_NORMAL_PORTS}" == "1" ]] && STARTCMD="${STARTCMD} --tlsOnNormalPorts"
     [[ -n "${MONGODB_SSL_MODE}" ]] && STARTCMD="${STARTCMD} --tlsMode ${MONGODB_SSL_MODE}"
     [[ -n "${MONGODB_SSL_CERTIFICATE_KEY_FILE}" ]] && STARTCMD="${STARTCMD} --tlsCertificateKeyFile ${MONGODB_SSL_CERTIFICATE_KEY_FILE}"