Update mongo #12625

tianon · 2022-06-13T16:31:24Z

Changes:

docker-library/mongo@533c0fa: Update 4.2-rc to 4.2.21-rc0
docker-library/mongo@97543f2: Merge pull request Remove postinst bug workaround mongo#545 from infosiftr/no-systemctl
docker-library/mongo@666ae6b: Remove postinst bug workaround
docker-library/mongo@f9e7845: Merge pull request Support provisioning with replication enabled through configuration file. mongo#458 from Sewci0/patch-1
docker-library/mongo@3813f6e: Support provisioning with replication enabled through configuration file

Changes: - docker-library/mongo@533c0fa: Update 4.2-rc to 4.2.21-rc0 - docker-library/mongo@97543f2: Merge pull request docker-library/mongo#545 from infosiftr/no-systemctl - docker-library/mongo@666ae6b: Remove postinst bug workaround - docker-library/mongo@f9e7845: Merge pull request docker-library/mongo#458 from Sewci0/patch-1 - docker-library/mongo@3813f6e: Support provisioning with replication enabled through configuration file

github-actions · 2022-06-13T16:33:55Z

Diff for cf0b50d:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 994e81c..9961bcf 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -32,13 +32,13 @@ Constraints: windowsservercore-ltsc2022
 Tags: 4.0.28-xenial, 4.0-xenial
 SharedTags: 4.0.28, 4.0
 Architectures: amd64, arm64v8
-GitCommit: 090e5631c17be189046b6dea907f0e5e75d01162
+GitCommit: 666ae6bd40f658bbdcb47587289572374756e031
 Directory: 4.0
 
 Tags: 4.2.20-bionic, 4.2-bionic
 SharedTags: 4.2.20, 4.2
 Architectures: amd64, arm64v8
-GitCommit: 090e5631c17be189046b6dea907f0e5e75d01162
+GitCommit: 666ae6bd40f658bbdcb47587289572374756e031
 Directory: 4.2
 
 Tags: 4.2.20-nanoserver-1809, 4.2-nanoserver-1809
@@ -69,10 +69,44 @@ GitCommit: 918850beff117aec4aa2cb8db464211d72930809
 Directory: 4.2/windows/windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
 
+Tags: 4.2.21-rc0-bionic, 4.2-rc-bionic
+SharedTags: 4.2.21-rc0, 4.2-rc
+Architectures: amd64, arm64v8
+GitCommit: 533c0fa265346774b03f81ada668fa57da26c757
+Directory: 4.2-rc
+
+Tags: 4.2.21-rc0-nanoserver-1809, 4.2-rc-nanoserver-1809
+SharedTags: 4.2.21-rc0-nanoserver, 4.2-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: 533c0fa265346774b03f81ada668fa57da26c757
+Directory: 4.2-rc/windows/nanoserver-1809
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 4.2.21-rc0-nanoserver-ltsc2022, 4.2-rc-nanoserver-ltsc2022
+SharedTags: 4.2.21-rc0-nanoserver, 4.2-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: 533c0fa265346774b03f81ada668fa57da26c757
+Directory: 4.2-rc/windows/nanoserver-ltsc2022
+Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
+
+Tags: 4.2.21-rc0-windowsservercore-1809, 4.2-rc-windowsservercore-1809
+SharedTags: 4.2.21-rc0-windowsservercore, 4.2-rc-windowsservercore, 4.2.21-rc0, 4.2-rc
+Architectures: windows-amd64
+GitCommit: 533c0fa265346774b03f81ada668fa57da26c757
+Directory: 4.2-rc/windows/windowsservercore-1809
+Constraints: windowsservercore-1809
+
+Tags: 4.2.21-rc0-windowsservercore-ltsc2022, 4.2-rc-windowsservercore-ltsc2022
+SharedTags: 4.2.21-rc0-windowsservercore, 4.2-rc-windowsservercore, 4.2.21-rc0, 4.2-rc
+Architectures: windows-amd64
+GitCommit: 533c0fa265346774b03f81ada668fa57da26c757
+Directory: 4.2-rc/windows/windowsservercore-ltsc2022
+Constraints: windowsservercore-ltsc2022
+
 Tags: 4.4.14-focal, 4.4-focal, 4-focal
 SharedTags: 4.4.14, 4.4, 4
 Architectures: amd64, arm64v8
-GitCommit: 090e5631c17be189046b6dea907f0e5e75d01162
+GitCommit: 666ae6bd40f658bbdcb47587289572374756e031
 Directory: 4.4
 
 Tags: 4.4.14-nanoserver-1809, 4.4-nanoserver-1809, 4-nanoserver-1809
@@ -106,7 +140,7 @@ Constraints: windowsservercore-ltsc2022
 Tags: 5.0.9-focal, 5.0-focal, 5-focal, focal
 SharedTags: 5.0.9, 5.0, 5, latest
 Architectures: amd64, arm64v8
-GitCommit: 3de39951a6ca04764651446a047441f016f426b0
+GitCommit: 666ae6bd40f658bbdcb47587289572374756e031
 Directory: 5.0
 
 Tags: 5.0.9-nanoserver-1809, 5.0-nanoserver-1809, 5-nanoserver-1809, nanoserver-1809
diff --git a/_bashbrew-list b/_bashbrew-list
index d641601..5270264 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -27,6 +27,14 @@ mongo:4.2-bionic
 mongo:4.2-nanoserver
 mongo:4.2-nanoserver-1809
 mongo:4.2-nanoserver-ltsc2022
+mongo:4.2-rc
+mongo:4.2-rc-bionic
+mongo:4.2-rc-nanoserver
+mongo:4.2-rc-nanoserver-1809
+mongo:4.2-rc-nanoserver-ltsc2022
+mongo:4.2-rc-windowsservercore
+mongo:4.2-rc-windowsservercore-1809
+mongo:4.2-rc-windowsservercore-ltsc2022
 mongo:4.2-windowsservercore
 mongo:4.2-windowsservercore-1809
 mongo:4.2-windowsservercore-ltsc2022
@@ -38,6 +46,14 @@ mongo:4.2.20-nanoserver-ltsc2022
 mongo:4.2.20-windowsservercore
 mongo:4.2.20-windowsservercore-1809
 mongo:4.2.20-windowsservercore-ltsc2022
+mongo:4.2.21-rc0
+mongo:4.2.21-rc0-bionic
+mongo:4.2.21-rc0-nanoserver
+mongo:4.2.21-rc0-nanoserver-1809
+mongo:4.2.21-rc0-nanoserver-ltsc2022
+mongo:4.2.21-rc0-windowsservercore
+mongo:4.2.21-rc0-windowsservercore-1809
+mongo:4.2.21-rc0-windowsservercore-ltsc2022
 mongo:4.4
 mongo:4.4-focal
 mongo:4.4-nanoserver
diff --git a/mongo_4-focal/Dockerfile b/mongo_4-focal/Dockerfile
index 873f2cf..c425b8a 100644
--- a/mongo_4-focal/Dockerfile
+++ b/mongo_4-focal/Dockerfile
@@ -99,15 +99,12 @@ RUN set -x \
 # installing "mongodb-enterprise" pulls in "tzdata" which prompts for input
 	&& export DEBIAN_FRONTEND=noninteractive \
 	&& apt-get update \
-# starting with MongoDB 4.3 (and backported to 4.0 and 4.2 *and* 3.6??), the postinst for server includes an unconditional "systemctl daemon-reload" (and we don't have anything for "systemctl" to talk to leading to dbus errors and failed package installs)
-	&& ln -s /bin/true /usr/local/bin/systemctl \
 	&& apt-get install -y \
 		${MONGO_PACKAGE}=$MONGO_VERSION \
 		${MONGO_PACKAGE}-server=$MONGO_VERSION \
 		${MONGO_PACKAGE}-shell=$MONGO_VERSION \
 		${MONGO_PACKAGE}-mongos=$MONGO_VERSION \
 		${MONGO_PACKAGE}-tools=$MONGO_VERSION \
-	&& rm -f /usr/local/bin/systemctl \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& rm -rf /var/lib/mongodb \
 	&& mv /etc/mongod.conf /etc/mongod.conf.orig
diff --git a/mongo_4-focal/docker-entrypoint.sh b/mongo_4-focal/docker-entrypoint.sh
index 2ab99df..e2c5a52 100755
--- a/mongo_4-focal/docker-entrypoint.sh
+++ b/mongo_4-focal/docker-entrypoint.sh
@@ -203,7 +203,7 @@ _parse_config() {
 			cat >&2 "$jsonConfigFile"
 			exit 1
 		fi
-		jq 'del(.systemLog, .processManagement, .net, .security)' "$jsonConfigFile" > "$tempConfigFile"
+		jq 'del(.systemLog, .processManagement, .net, .security, .replication)' "$jsonConfigFile" > "$tempConfigFile"
 		return 0
 	fi
 
diff --git a/mongo_4.0-xenial/Dockerfile b/mongo_4.0-xenial/Dockerfile
index 037c0e1..c380a2e 100644
--- a/mongo_4.0-xenial/Dockerfile
+++ b/mongo_4.0-xenial/Dockerfile
@@ -99,15 +99,12 @@ RUN set -x \
 # installing "mongodb-enterprise" pulls in "tzdata" which prompts for input
 	&& export DEBIAN_FRONTEND=noninteractive \
 	&& apt-get update \
-# starting with MongoDB 4.3 (and backported to 4.0 and 4.2 *and* 3.6??), the postinst for server includes an unconditional "systemctl daemon-reload" (and we don't have anything for "systemctl" to talk to leading to dbus errors and failed package installs)
-	&& ln -s /bin/true /usr/local/bin/systemctl \
 	&& apt-get install -y \
 		${MONGO_PACKAGE}=$MONGO_VERSION \
 		${MONGO_PACKAGE}-server=$MONGO_VERSION \
 		${MONGO_PACKAGE}-shell=$MONGO_VERSION \
 		${MONGO_PACKAGE}-mongos=$MONGO_VERSION \
 		${MONGO_PACKAGE}-tools=$MONGO_VERSION \
-	&& rm -f /usr/local/bin/systemctl \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& rm -rf /var/lib/mongodb \
 	&& mv /etc/mongod.conf /etc/mongod.conf.orig
diff --git a/mongo_4.0-xenial/docker-entrypoint.sh b/mongo_4.0-xenial/docker-entrypoint.sh
index 2ab99df..e2c5a52 100755
--- a/mongo_4.0-xenial/docker-entrypoint.sh
+++ b/mongo_4.0-xenial/docker-entrypoint.sh
@@ -203,7 +203,7 @@ _parse_config() {
 			cat >&2 "$jsonConfigFile"
 			exit 1
 		fi
-		jq 'del(.systemLog, .processManagement, .net, .security)' "$jsonConfigFile" > "$tempConfigFile"
+		jq 'del(.systemLog, .processManagement, .net, .security, .replication)' "$jsonConfigFile" > "$tempConfigFile"
 		return 0
 	fi
 
diff --git a/mongo_4.2-bionic/Dockerfile b/mongo_4.2-bionic/Dockerfile
index 1216674..bf50a8a 100644
--- a/mongo_4.2-bionic/Dockerfile
+++ b/mongo_4.2-bionic/Dockerfile
@@ -99,15 +99,12 @@ RUN set -x \
 # installing "mongodb-enterprise" pulls in "tzdata" which prompts for input
 	&& export DEBIAN_FRONTEND=noninteractive \
 	&& apt-get update \
-# starting with MongoDB 4.3 (and backported to 4.0 and 4.2 *and* 3.6??), the postinst for server includes an unconditional "systemctl daemon-reload" (and we don't have anything for "systemctl" to talk to leading to dbus errors and failed package installs)
-	&& ln -s /bin/true /usr/local/bin/systemctl \
 	&& apt-get install -y \
 		${MONGO_PACKAGE}=$MONGO_VERSION \
 		${MONGO_PACKAGE}-server=$MONGO_VERSION \
 		${MONGO_PACKAGE}-shell=$MONGO_VERSION \
 		${MONGO_PACKAGE}-mongos=$MONGO_VERSION \
 		${MONGO_PACKAGE}-tools=$MONGO_VERSION \
-	&& rm -f /usr/local/bin/systemctl \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& rm -rf /var/lib/mongodb \
 	&& mv /etc/mongod.conf /etc/mongod.conf.orig
diff --git a/mongo_4.2-bionic/docker-entrypoint.sh b/mongo_4.2-bionic/docker-entrypoint.sh
index 2ab99df..e2c5a52 100755
--- a/mongo_4.2-bionic/docker-entrypoint.sh
+++ b/mongo_4.2-bionic/docker-entrypoint.sh
@@ -203,7 +203,7 @@ _parse_config() {
 			cat >&2 "$jsonConfigFile"
 			exit 1
 		fi
-		jq 'del(.systemLog, .processManagement, .net, .security)' "$jsonConfigFile" > "$tempConfigFile"
+		jq 'del(.systemLog, .processManagement, .net, .security, .replication)' "$jsonConfigFile" > "$tempConfigFile"
 		return 0
 	fi
 
diff --git a/mongo_4.2-bionic/Dockerfile b/mongo_4.2-rc-bionic/Dockerfile
similarity index 89%
copy from mongo_4.2-bionic/Dockerfile
copy to mongo_4.2-rc-bionic/Dockerfile
index 1216674..7d66375 100644
--- a/mongo_4.2-bionic/Dockerfile
+++ b/mongo_4.2-rc-bionic/Dockerfile
@@ -71,7 +71,7 @@ RUN mkdir /docker-entrypoint-initdb.d
 
 RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
-	set -- 'E162F504A20CDF15827F718D4B7C549A058F8B6B'; \
+	set -- '20691EEC35216C63CAF66CE1656408E390CFB1F5' '39BD841E4BE5FB195A65400E6A26B1AE64C3C388' '9DA31620334BD75D9DCB49F368818C72E52529D4' 'E162F504A20CDF15827F718D4B7C549A058F8B6B' 'F5679A222C647C87527C2F8CB00A0BD1E2C63C11'; \
 	for key; do \
 		gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
 	done; \
@@ -88,26 +88,23 @@ ARG MONGO_PACKAGE=mongodb-org
 ARG MONGO_REPO=repo.mongodb.org
 ENV MONGO_PACKAGE=${MONGO_PACKAGE} MONGO_REPO=${MONGO_REPO}
 
-ENV MONGO_MAJOR 4.2
+ENV MONGO_MAJOR testing
 RUN echo "deb [ signed-by=/etc/apt/keyrings/mongodb.gpg ] http://$MONGO_REPO/apt/ubuntu bionic/${MONGO_PACKAGE%-unstable}/$MONGO_MAJOR multiverse" | tee "/etc/apt/sources.list.d/${MONGO_PACKAGE%-unstable}.list"
 
 # https://docs.mongodb.org/master/release-notes/4.2/
-ENV MONGO_VERSION 4.2.20
-# 05/04/2022, https://github.com/mongodb/mongo/tree/15c0712952c356cb711c13a42cb3bca8617d4ebc
+ENV MONGO_VERSION 4.2.21~rc0
+# 06/08/2022, https://github.com/mongodb/mongo/tree/b0aeed9445ff41af07449fa757e1f231bce990b3
 
 RUN set -x \
 # installing "mongodb-enterprise" pulls in "tzdata" which prompts for input
 	&& export DEBIAN_FRONTEND=noninteractive \
 	&& apt-get update \
-# starting with MongoDB 4.3 (and backported to 4.0 and 4.2 *and* 3.6??), the postinst for server includes an unconditional "systemctl daemon-reload" (and we don't have anything for "systemctl" to talk to leading to dbus errors and failed package installs)
-	&& ln -s /bin/true /usr/local/bin/systemctl \
 	&& apt-get install -y \
 		${MONGO_PACKAGE}=$MONGO_VERSION \
 		${MONGO_PACKAGE}-server=$MONGO_VERSION \
 		${MONGO_PACKAGE}-shell=$MONGO_VERSION \
 		${MONGO_PACKAGE}-mongos=$MONGO_VERSION \
 		${MONGO_PACKAGE}-tools=$MONGO_VERSION \
-	&& rm -f /usr/local/bin/systemctl \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& rm -rf /var/lib/mongodb \
 	&& mv /etc/mongod.conf /etc/mongod.conf.orig
diff --git a/mongo_focal/docker-entrypoint.sh b/mongo_4.2-rc-bionic/docker-entrypoint.sh
similarity index 99%
copy from mongo_focal/docker-entrypoint.sh
copy to mongo_4.2-rc-bionic/docker-entrypoint.sh
index 2ab99df..e2c5a52 100755
--- a/mongo_focal/docker-entrypoint.sh
+++ b/mongo_4.2-rc-bionic/docker-entrypoint.sh
@@ -203,7 +203,7 @@ _parse_config() {
 			cat >&2 "$jsonConfigFile"
 			exit 1
 		fi
-		jq 'del(.systemLog, .processManagement, .net, .security)' "$jsonConfigFile" > "$tempConfigFile"
+		jq 'del(.systemLog, .processManagement, .net, .security, .replication)' "$jsonConfigFile" > "$tempConfigFile"
 		return 0
 	fi
 
diff --git a/mongo_4.2-nanoserver-1809/Dockerfile b/mongo_4.2-rc-nanoserver-1809/Dockerfile
similarity index 73%
copy from mongo_4.2-nanoserver-1809/Dockerfile
copy to mongo_4.2-rc-nanoserver-1809/Dockerfile
index 3f3ea02..0b80e25 100644
--- a/mongo_4.2-nanoserver-1809/Dockerfile
+++ b/mongo_4.2-rc-nanoserver-1809/Dockerfile
@@ -14,16 +14,16 @@ RUN setx /m PATH "C:\mongodb\bin;%PATH%"
 USER ContainerUser
 # doing this first to share cache across versions more aggressively
 
-COPY --from=mongo:4.2.20-windowsservercore-1809 \
+COPY --from=mongo:4.2.21-rc0-windowsservercore-1809 \
 	C:\\Windows\\System32\\msvcp140.dll \
 	C:\\Windows\\System32\\vcruntime140.dll \
 	C:\\Windows\\System32\\
 
 # https://docs.mongodb.org/master/release-notes/4.2/
-ENV MONGO_VERSION 4.2.20
-# 05/04/2022, https://github.com/mongodb/mongo/tree/15c0712952c356cb711c13a42cb3bca8617d4ebc
+ENV MONGO_VERSION 4.2.21-rc0
+# 06/08/2022, https://github.com/mongodb/mongo/tree/b0aeed9445ff41af07449fa757e1f231bce990b3
 
-COPY --from=mongo:4.2.20-windowsservercore-1809 C:\\mongodb C:\\mongodb
+COPY --from=mongo:4.2.21-rc0-windowsservercore-1809 C:\\mongodb C:\\mongodb
 RUN mongo --version && mongod --version
 
 VOLUME C:\\data\\db C:\\data\\configdb
diff --git a/mongo_4.2-nanoserver-ltsc2022/Dockerfile b/mongo_4.2-rc-nanoserver-ltsc2022/Dockerfile
similarity index 73%
copy from mongo_4.2-nanoserver-ltsc2022/Dockerfile
copy to mongo_4.2-rc-nanoserver-ltsc2022/Dockerfile
index ab59d7a..4e04d2a 100644
--- a/mongo_4.2-nanoserver-ltsc2022/Dockerfile
+++ b/mongo_4.2-rc-nanoserver-ltsc2022/Dockerfile
@@ -14,16 +14,16 @@ RUN setx /m PATH "C:\mongodb\bin;%PATH%"
 USER ContainerUser
 # doing this first to share cache across versions more aggressively
 
-COPY --from=mongo:4.2.20-windowsservercore-ltsc2022 \
+COPY --from=mongo:4.2.21-rc0-windowsservercore-ltsc2022 \
 	C:\\Windows\\System32\\msvcp140.dll \
 	C:\\Windows\\System32\\vcruntime140.dll \
 	C:\\Windows\\System32\\
 
 # https://docs.mongodb.org/master/release-notes/4.2/
-ENV MONGO_VERSION 4.2.20
-# 05/04/2022, https://github.com/mongodb/mongo/tree/15c0712952c356cb711c13a42cb3bca8617d4ebc
+ENV MONGO_VERSION 4.2.21-rc0
+# 06/08/2022, https://github.com/mongodb/mongo/tree/b0aeed9445ff41af07449fa757e1f231bce990b3
 
-COPY --from=mongo:4.2.20-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
+COPY --from=mongo:4.2.21-rc0-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
 RUN mongo --version && mongod --version
 
 VOLUME C:\\data\\db C:\\data\\configdb
diff --git a/mongo_4.2-windowsservercore-1809/Dockerfile b/mongo_4.2-rc-windowsservercore-1809/Dockerfile
similarity index 89%
copy from mongo_4.2-windowsservercore-1809/Dockerfile
copy to mongo_4.2-rc-windowsservercore-1809/Dockerfile
index 8e1a256..10ba85d 100644
--- a/mongo_4.2-windowsservercore-1809/Dockerfile
+++ b/mongo_4.2-rc-windowsservercore-1809/Dockerfile
@@ -9,11 +9,11 @@ FROM mcr.microsoft.com/windows/servercore:1809
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
 
 # https://docs.mongodb.org/master/release-notes/4.2/
-ENV MONGO_VERSION 4.2.20
-# 05/04/2022, https://github.com/mongodb/mongo/tree/15c0712952c356cb711c13a42cb3bca8617d4ebc
+ENV MONGO_VERSION 4.2.21-rc0
+# 06/08/2022, https://github.com/mongodb/mongo/tree/b0aeed9445ff41af07449fa757e1f231bce990b3
 
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2012plus-4.2.20-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=8a41f7e20dc9a7046f5fc2d189dce853fe2c38466a5e4b9b2b659bc561a11794
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2012plus-4.2.21-rc0-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=7259970fbba704936884a89ef90edde12e54c5ff59138185af82a2a66e91d28b
 
 RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
diff --git a/mongo_4.2-windowsservercore-ltsc2022/Dockerfile b/mongo_4.2-rc-windowsservercore-ltsc2022/Dockerfile
similarity index 89%
copy from mongo_4.2-windowsservercore-ltsc2022/Dockerfile
copy to mongo_4.2-rc-windowsservercore-ltsc2022/Dockerfile
index 63e6f16..d4ee57f 100644
--- a/mongo_4.2-windowsservercore-ltsc2022/Dockerfile
+++ b/mongo_4.2-rc-windowsservercore-ltsc2022/Dockerfile
@@ -9,11 +9,11 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
 
 # https://docs.mongodb.org/master/release-notes/4.2/
-ENV MONGO_VERSION 4.2.20
-# 05/04/2022, https://github.com/mongodb/mongo/tree/15c0712952c356cb711c13a42cb3bca8617d4ebc
+ENV MONGO_VERSION 4.2.21-rc0
+# 06/08/2022, https://github.com/mongodb/mongo/tree/b0aeed9445ff41af07449fa757e1f231bce990b3
 
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2012plus-4.2.20-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=8a41f7e20dc9a7046f5fc2d189dce853fe2c38466a5e4b9b2b659bc561a11794
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2012plus-4.2.21-rc0-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=7259970fbba704936884a89ef90edde12e54c5ff59138185af82a2a66e91d28b
 
 RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
diff --git a/mongo_focal/Dockerfile b/mongo_focal/Dockerfile
index 7761969..67caf92 100644
--- a/mongo_focal/Dockerfile
+++ b/mongo_focal/Dockerfile
@@ -99,15 +99,12 @@ RUN set -x \
 # installing "mongodb-enterprise" pulls in "tzdata" which prompts for input
 	&& export DEBIAN_FRONTEND=noninteractive \
 	&& apt-get update \
-# starting with MongoDB 4.3 (and backported to 4.0 and 4.2 *and* 3.6??), the postinst for server includes an unconditional "systemctl daemon-reload" (and we don't have anything for "systemctl" to talk to leading to dbus errors and failed package installs)
-	&& ln -s /bin/true /usr/local/bin/systemctl \
 	&& apt-get install -y \
 		${MONGO_PACKAGE}=$MONGO_VERSION \
 		${MONGO_PACKAGE}-server=$MONGO_VERSION \
 		${MONGO_PACKAGE}-shell=$MONGO_VERSION \
 		${MONGO_PACKAGE}-mongos=$MONGO_VERSION \
 		${MONGO_PACKAGE}-tools=$MONGO_VERSION \
-	&& rm -f /usr/local/bin/systemctl \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& rm -rf /var/lib/mongodb \
 	&& mv /etc/mongod.conf /etc/mongod.conf.orig
diff --git a/mongo_focal/docker-entrypoint.sh b/mongo_focal/docker-entrypoint.sh
index 2ab99df..e2c5a52 100755
--- a/mongo_focal/docker-entrypoint.sh
+++ b/mongo_focal/docker-entrypoint.sh
@@ -203,7 +203,7 @@ _parse_config() {
 			cat >&2 "$jsonConfigFile"
 			exit 1
 		fi
-		jq 'del(.systemLog, .processManagement, .net, .security)' "$jsonConfigFile" > "$tempConfigFile"
+		jq 'del(.systemLog, .processManagement, .net, .security, .replication)' "$jsonConfigFile" > "$tempConfigFile"
 		return 0
 	fi

Relevant Maintainers:

mongo: @tianon @yosifkit

github-actions bot added the library/mongo label Jun 13, 2022

yosifkit merged commit 55817ac into docker-library:master Jun 13, 2022

yosifkit deleted the mongo branch June 13, 2022 21:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update mongo #12625

Update mongo #12625

tianon commented Jun 13, 2022

github-actions bot commented Jun 13, 2022

Update mongo #12625

Update mongo #12625

Conversation

tianon commented Jun 13, 2022

github-actions bot commented Jun 13, 2022