Merge pull request #93 from krzys-h/fix-enableFreeMonitoring-latest

Fix '--enableFreeMonitoring' in the 'latest' tag as well
dockhippie · Jan 16, 2024 · 6a171d2 · 6a171d2
2 parents 1db345b + 7e8ed37
commit 6a171d2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/latest/overlay/etc/entrypoint.d/05-base.sh b/latest/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/latest/overlay/usr/bin/container b/latest/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}"