Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update mongo #18150

Merged
merged 1 commit into from
Dec 23, 2024
Merged

Update mongo #18150

merged 1 commit into from
Dec 23, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Dec 20, 2024

Changes:

@tianon tianon marked this pull request as ready for review December 20, 2024 20:41
@tianon tianon requested review from LaurentGoderre and a team as code owners December 20, 2024 20:41

This comment has been minimized.

Changes:

- docker-library/mongo@475098f: Update 7.0-rc
- docker-library/mongo@72916ee: Update 7.0 to 7.0.16
- docker-library/mongo@47aa116: Update 5.0-rc
- docker-library/mongo@f071254: Update 5.0-rc to 5.0.31-rc0
- docker-library/mongo@c26cfcf: Simplify and update `verify-templating.yml`
Copy link

Diff for ebb5c54:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 079d854..bc24c95 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -35,6 +35,40 @@ GitCommit: 65909c24a2d4c3380b7a6512fd83dbc9ce00244f
 Directory: 5.0/windows/windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
 
+Tags: 5.0.31-rc0-focal, 5.0-rc-focal
+SharedTags: 5.0.31-rc0, 5.0-rc
+Architectures: amd64, arm64v8
+GitCommit: f0712548bae21e89d12f559005b9ee576869ce00
+Directory: 5.0-rc
+
+Tags: 5.0.31-rc0-nanoserver-1809, 5.0-rc-nanoserver-1809
+SharedTags: 5.0.31-rc0-nanoserver, 5.0-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: f0712548bae21e89d12f559005b9ee576869ce00
+Directory: 5.0-rc/windows/nanoserver-1809
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 5.0.31-rc0-nanoserver-ltsc2022, 5.0-rc-nanoserver-ltsc2022
+SharedTags: 5.0.31-rc0-nanoserver, 5.0-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: f0712548bae21e89d12f559005b9ee576869ce00
+Directory: 5.0-rc/windows/nanoserver-ltsc2022
+Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
+
+Tags: 5.0.31-rc0-windowsservercore-1809, 5.0-rc-windowsservercore-1809
+SharedTags: 5.0.31-rc0-windowsservercore, 5.0-rc-windowsservercore, 5.0.31-rc0, 5.0-rc
+Architectures: windows-amd64
+GitCommit: 47aa1164218dc68ae0386d06f8ec3d472ac4042a
+Directory: 5.0-rc/windows/windowsservercore-1809
+Constraints: windowsservercore-1809
+
+Tags: 5.0.31-rc0-windowsservercore-ltsc2022, 5.0-rc-windowsservercore-ltsc2022
+SharedTags: 5.0.31-rc0-windowsservercore, 5.0-rc-windowsservercore, 5.0.31-rc0, 5.0-rc
+Architectures: windows-amd64
+GitCommit: 47aa1164218dc68ae0386d06f8ec3d472ac4042a
+Directory: 5.0-rc/windows/windowsservercore-ltsc2022
+Constraints: windowsservercore-ltsc2022
+
 Tags: 6.0.19-jammy, 6.0-jammy, 6-jammy
 SharedTags: 6.0.19, 6.0, 6
 Architectures: amd64, arm64v8
@@ -103,74 +137,40 @@ GitCommit: b709726695914275c03b7dd9d61f8d895b44a3a3
 Directory: 6.0-rc/windows/windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
 
-Tags: 7.0.15-jammy, 7.0-jammy, 7-jammy
-SharedTags: 7.0.15, 7.0, 7
+Tags: 7.0.16-jammy, 7.0-jammy, 7-jammy
+SharedTags: 7.0.16, 7.0, 7
 Architectures: amd64, arm64v8
-GitCommit: fb053f7c75e82abda54654868528c343fdf3358e
+GitCommit: 72916ee710ba8eef042048bdabda8302a0912a81
 Directory: 7.0
 
-Tags: 7.0.15-nanoserver-1809, 7.0-nanoserver-1809, 7-nanoserver-1809
-SharedTags: 7.0.15-nanoserver, 7.0-nanoserver, 7-nanoserver
+Tags: 7.0.16-nanoserver-1809, 7.0-nanoserver-1809, 7-nanoserver-1809
+SharedTags: 7.0.16-nanoserver, 7.0-nanoserver, 7-nanoserver
 Architectures: windows-amd64
-GitCommit: fb053f7c75e82abda54654868528c343fdf3358e
+GitCommit: 72916ee710ba8eef042048bdabda8302a0912a81
 Directory: 7.0/windows/nanoserver-1809
 Constraints: nanoserver-1809, windowsservercore-1809
 
-Tags: 7.0.15-nanoserver-ltsc2022, 7.0-nanoserver-ltsc2022, 7-nanoserver-ltsc2022
-SharedTags: 7.0.15-nanoserver, 7.0-nanoserver, 7-nanoserver
+Tags: 7.0.16-nanoserver-ltsc2022, 7.0-nanoserver-ltsc2022, 7-nanoserver-ltsc2022
+SharedTags: 7.0.16-nanoserver, 7.0-nanoserver, 7-nanoserver
 Architectures: windows-amd64
-GitCommit: fb053f7c75e82abda54654868528c343fdf3358e
+GitCommit: 72916ee710ba8eef042048bdabda8302a0912a81
 Directory: 7.0/windows/nanoserver-ltsc2022
 Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
 
-Tags: 7.0.15-windowsservercore-1809, 7.0-windowsservercore-1809, 7-windowsservercore-1809
-SharedTags: 7.0.15-windowsservercore, 7.0-windowsservercore, 7-windowsservercore, 7.0.15, 7.0, 7
+Tags: 7.0.16-windowsservercore-1809, 7.0-windowsservercore-1809, 7-windowsservercore-1809
+SharedTags: 7.0.16-windowsservercore, 7.0-windowsservercore, 7-windowsservercore, 7.0.16, 7.0, 7
 Architectures: windows-amd64
-GitCommit: fb053f7c75e82abda54654868528c343fdf3358e
+GitCommit: 72916ee710ba8eef042048bdabda8302a0912a81
 Directory: 7.0/windows/windowsservercore-1809
 Constraints: windowsservercore-1809
 
-Tags: 7.0.15-windowsservercore-ltsc2022, 7.0-windowsservercore-ltsc2022, 7-windowsservercore-ltsc2022
-SharedTags: 7.0.15-windowsservercore, 7.0-windowsservercore, 7-windowsservercore, 7.0.15, 7.0, 7
+Tags: 7.0.16-windowsservercore-ltsc2022, 7.0-windowsservercore-ltsc2022, 7-windowsservercore-ltsc2022
+SharedTags: 7.0.16-windowsservercore, 7.0-windowsservercore, 7-windowsservercore, 7.0.16, 7.0, 7
 Architectures: windows-amd64
-GitCommit: fb053f7c75e82abda54654868528c343fdf3358e
+GitCommit: 72916ee710ba8eef042048bdabda8302a0912a81
 Directory: 7.0/windows/windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
 
-Tags: 7.0.16-rc1-jammy, 7.0-rc-jammy
-SharedTags: 7.0.16-rc1, 7.0-rc
-Architectures: amd64, arm64v8
-GitCommit: e8f0640ef8c396d7a72d6fee5bd008b2b8407164
-Directory: 7.0-rc
-
-Tags: 7.0.16-rc1-nanoserver-1809, 7.0-rc-nanoserver-1809
-SharedTags: 7.0.16-rc1-nanoserver, 7.0-rc-nanoserver
-Architectures: windows-amd64
-GitCommit: e8f0640ef8c396d7a72d6fee5bd008b2b8407164
-Directory: 7.0-rc/windows/nanoserver-1809
-Constraints: nanoserver-1809, windowsservercore-1809
-
-Tags: 7.0.16-rc1-nanoserver-ltsc2022, 7.0-rc-nanoserver-ltsc2022
-SharedTags: 7.0.16-rc1-nanoserver, 7.0-rc-nanoserver
-Architectures: windows-amd64
-GitCommit: e8f0640ef8c396d7a72d6fee5bd008b2b8407164
-Directory: 7.0-rc/windows/nanoserver-ltsc2022
-Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
-
-Tags: 7.0.16-rc1-windowsservercore-1809, 7.0-rc-windowsservercore-1809
-SharedTags: 7.0.16-rc1-windowsservercore, 7.0-rc-windowsservercore, 7.0.16-rc1, 7.0-rc
-Architectures: windows-amd64
-GitCommit: e8f0640ef8c396d7a72d6fee5bd008b2b8407164
-Directory: 7.0-rc/windows/windowsservercore-1809
-Constraints: windowsservercore-1809
-
-Tags: 7.0.16-rc1-windowsservercore-ltsc2022, 7.0-rc-windowsservercore-ltsc2022
-SharedTags: 7.0.16-rc1-windowsservercore, 7.0-rc-windowsservercore, 7.0.16-rc1, 7.0-rc
-Architectures: windows-amd64
-GitCommit: e8f0640ef8c396d7a72d6fee5bd008b2b8407164
-Directory: 7.0-rc/windows/windowsservercore-ltsc2022
-Constraints: windowsservercore-ltsc2022
-
 Tags: 8.0.4-nanoserver-1809, 8.0-nanoserver-1809, 8-nanoserver-1809, nanoserver-1809
 SharedTags: 8.0.4-nanoserver, 8.0-nanoserver, 8-nanoserver, nanoserver
 Architectures: windows-amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index 72c7233..dcaebc9 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -11,6 +11,14 @@ mongo:5.0-focal
 mongo:5.0-nanoserver
 mongo:5.0-nanoserver-1809
 mongo:5.0-nanoserver-ltsc2022
+mongo:5.0-rc
+mongo:5.0-rc-focal
+mongo:5.0-rc-nanoserver
+mongo:5.0-rc-nanoserver-1809
+mongo:5.0-rc-nanoserver-ltsc2022
+mongo:5.0-rc-windowsservercore
+mongo:5.0-rc-windowsservercore-1809
+mongo:5.0-rc-windowsservercore-ltsc2022
 mongo:5.0-windowsservercore
 mongo:5.0-windowsservercore-1809
 mongo:5.0-windowsservercore-ltsc2022
@@ -22,6 +30,14 @@ mongo:5.0.30-nanoserver-ltsc2022
 mongo:5.0.30-windowsservercore
 mongo:5.0.30-windowsservercore-1809
 mongo:5.0.30-windowsservercore-ltsc2022
+mongo:5.0.31-rc0
+mongo:5.0.31-rc0-focal
+mongo:5.0.31-rc0-nanoserver
+mongo:5.0.31-rc0-nanoserver-1809
+mongo:5.0.31-rc0-nanoserver-ltsc2022
+mongo:5.0.31-rc0-windowsservercore
+mongo:5.0.31-rc0-windowsservercore-1809
+mongo:5.0.31-rc0-windowsservercore-ltsc2022
 mongo:6
 mongo:6-jammy
 mongo:6-nanoserver
@@ -75,33 +91,17 @@ mongo:7.0-jammy
 mongo:7.0-nanoserver
 mongo:7.0-nanoserver-1809
 mongo:7.0-nanoserver-ltsc2022
-mongo:7.0-rc
-mongo:7.0-rc-jammy
-mongo:7.0-rc-nanoserver
-mongo:7.0-rc-nanoserver-1809
-mongo:7.0-rc-nanoserver-ltsc2022
-mongo:7.0-rc-windowsservercore
-mongo:7.0-rc-windowsservercore-1809
-mongo:7.0-rc-windowsservercore-ltsc2022
 mongo:7.0-windowsservercore
 mongo:7.0-windowsservercore-1809
 mongo:7.0-windowsservercore-ltsc2022
-mongo:7.0.15
-mongo:7.0.15-jammy
-mongo:7.0.15-nanoserver
-mongo:7.0.15-nanoserver-1809
-mongo:7.0.15-nanoserver-ltsc2022
-mongo:7.0.15-windowsservercore
-mongo:7.0.15-windowsservercore-1809
-mongo:7.0.15-windowsservercore-ltsc2022
-mongo:7.0.16-rc1
-mongo:7.0.16-rc1-jammy
-mongo:7.0.16-rc1-nanoserver
-mongo:7.0.16-rc1-nanoserver-1809
-mongo:7.0.16-rc1-nanoserver-ltsc2022
-mongo:7.0.16-rc1-windowsservercore
-mongo:7.0.16-rc1-windowsservercore-1809
-mongo:7.0.16-rc1-windowsservercore-ltsc2022
+mongo:7.0.16
+mongo:7.0.16-jammy
+mongo:7.0.16-nanoserver
+mongo:7.0.16-nanoserver-1809
+mongo:7.0.16-nanoserver-ltsc2022
+mongo:7.0.16-windowsservercore
+mongo:7.0.16-windowsservercore-1809
+mongo:7.0.16-windowsservercore-ltsc2022
 mongo:8
 mongo:8-nanoserver
 mongo:8-nanoserver-1809
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 03bb2db..1f1a94d 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,6 +1,9 @@
 mongo:5-focal
 mongo:5-windowsservercore-1809
 mongo:5-windowsservercore-ltsc2022
+mongo:5.0-rc-focal
+mongo:5.0-rc-windowsservercore-1809
+mongo:5.0-rc-windowsservercore-ltsc2022
 mongo:6-jammy
 mongo:6-windowsservercore-1809
 mongo:6-windowsservercore-ltsc2022
@@ -10,21 +13,18 @@ mongo:6.0-rc-windowsservercore-ltsc2022
 mongo:7-jammy
 mongo:7-windowsservercore-1809
 mongo:7-windowsservercore-ltsc2022
-mongo:7.0-rc-jammy
-mongo:7.0-rc-windowsservercore-1809
-mongo:7.0-rc-windowsservercore-ltsc2022
 mongo:noble
 mongo:windowsservercore-1809
 mongo:windowsservercore-ltsc2022
 mongo:5-nanoserver-1809
 mongo:5-nanoserver-ltsc2022
+mongo:5.0-rc-nanoserver-1809
+mongo:5.0-rc-nanoserver-ltsc2022
 mongo:6-nanoserver-1809
 mongo:6-nanoserver-ltsc2022
 mongo:6.0-rc-nanoserver-1809
 mongo:6.0-rc-nanoserver-ltsc2022
 mongo:7-nanoserver-1809
 mongo:7-nanoserver-ltsc2022
-mongo:7.0-rc-nanoserver-1809
-mongo:7.0-rc-nanoserver-ltsc2022
 mongo:nanoserver-1809
 mongo:nanoserver-ltsc2022
diff --git a/mongo_7.0-rc-jammy/Dockerfile b/mongo_5.0-rc-focal/Dockerfile
similarity index 88%
rename from mongo_7.0-rc-jammy/Dockerfile
rename to mongo_5.0-rc-focal/Dockerfile
index 1f127ec..4c777fe 100644
--- a/mongo_7.0-rc-jammy/Dockerfile
+++ b/mongo_5.0-rc-focal/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM ubuntu:jammy
+FROM ubuntu:focal
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN set -eux; \
@@ -59,10 +59,10 @@ RUN set -eux; \
 	\
 # download/install MongoDB PGP keys
 	export GNUPGHOME="$(mktemp -d)"; \
-	wget -O KEYS 'https://pgp.mongodb.com/server-dev.asc' 'https://pgp.mongodb.com/server-7.0.asc'; \
+	wget -O KEYS 'https://pgp.mongodb.com/server-dev.asc' 'https://pgp.mongodb.com/server-5.0.asc'; \
 	gpg --batch --import KEYS; \
 	mkdir -p /etc/apt/keyrings; \
-	gpg --batch --export --armor '28DE23AF08040FB24C33F36381B0EBBBADCEA95C' 'E58830201F7DD82CD808AA84160D26BB1785BA38' > /etc/apt/keyrings/mongodb.asc; \
+	gpg --batch --export --armor '28DE23AF08040FB24C33F36381B0EBBBADCEA95C' 'F5679A222C647C87527C2F8CB00A0BD1E2C63C11' > /etc/apt/keyrings/mongodb.asc; \
 	gpgconf --kill all; \
 	rm -rf "$GNUPGHOME" KEYS; \
 	\
@@ -86,13 +86,13 @@ ARG MONGO_REPO=repo.mongodb.org
 ENV MONGO_PACKAGE=${MONGO_PACKAGE} MONGO_REPO=${MONGO_REPO}
 
 ENV MONGO_MAJOR testing
-RUN echo "deb [ signed-by=/etc/apt/keyrings/mongodb.asc ] http://$MONGO_REPO/apt/ubuntu jammy/${MONGO_PACKAGE%-unstable}/$MONGO_MAJOR multiverse" | tee "/etc/apt/sources.list.d/${MONGO_PACKAGE%-unstable}.list"
+RUN echo "deb [ signed-by=/etc/apt/keyrings/mongodb.asc ] http://$MONGO_REPO/apt/ubuntu focal/${MONGO_PACKAGE%-unstable}/$MONGO_MAJOR multiverse" | tee "/etc/apt/sources.list.d/${MONGO_PACKAGE%-unstable}.list"
 # add GA repo for mongodb-mongosh and mongodb-database-tools
-RUN echo "deb [ signed-by=/etc/apt/keyrings/mongodb.asc ] http://$MONGO_REPO/apt/ubuntu jammy/${MONGO_PACKAGE%-unstable}/7.0 multiverse" | tee "/etc/apt/sources.list.d/mongodb-7.0.list"
+RUN echo "deb [ signed-by=/etc/apt/keyrings/mongodb.asc ] http://$MONGO_REPO/apt/ubuntu focal/${MONGO_PACKAGE%-unstable}/5.0 multiverse" | tee "/etc/apt/sources.list.d/mongodb-5.0.list"
 
-# https://docs.mongodb.org/master/release-notes/7.0/
-ENV MONGO_VERSION 7.0.16~rc1
-# 12/03/2024, https://github.com/mongodb/mongo/tree/18b949444cfdaa88e30b0e10243bc18268251c1f
+# https://docs.mongodb.org/master/release-notes/5.0/
+ENV MONGO_VERSION 5.0.31~rc0
+# 12/19/2024, https://github.com/mongodb/mongo/tree/e341c22ae81226decb4ae08a36363c08b23d64cd
 
 RUN set -x \
 # installing "mongodb-enterprise" pulls in "tzdata" which prompts for input
@@ -104,8 +104,6 @@ RUN set -x \
 		${MONGO_PACKAGE}-shell=$MONGO_VERSION \
 		${MONGO_PACKAGE}-mongos=$MONGO_VERSION \
 		${MONGO_PACKAGE}-tools=$MONGO_VERSION \
-		${MONGO_PACKAGE}-database=$MONGO_VERSION \
-		${MONGO_PACKAGE}-database-tools-extra=$MONGO_VERSION \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& rm -rf /var/lib/mongodb \
 	&& mv /etc/mongod.conf /etc/mongod.conf.orig
diff --git a/mongo_7.0-rc-jammy/docker-entrypoint.sh b/mongo_5.0-rc-focal/docker-entrypoint.sh
similarity index 100%
rename from mongo_7.0-rc-jammy/docker-entrypoint.sh
rename to mongo_5.0-rc-focal/docker-entrypoint.sh
diff --git a/mongo_7.0-rc-nanoserver-1809/Dockerfile b/mongo_5.0-rc-nanoserver-1809/Dockerfile
similarity index 68%
rename from mongo_7.0-rc-nanoserver-1809/Dockerfile
rename to mongo_5.0-rc-nanoserver-1809/Dockerfile
index 8c66764..0891815 100644
--- a/mongo_7.0-rc-nanoserver-1809/Dockerfile
+++ b/mongo_5.0-rc-nanoserver-1809/Dockerfile
@@ -14,19 +14,19 @@ RUN setx /m PATH "C:\mongodb\bin;%PATH%"
 USER ContainerUser
 # doing this first to share cache across versions more aggressively
 
-COPY --from=mongo:7.0.16-rc1-windowsservercore-1809 \
+COPY --from=mongo:5.0.31-rc0-windowsservercore-1809 \
 	C:\\Windows\\System32\\msvcp140.dll \
 	C:\\Windows\\System32\\msvcp140_1.dll \
 	C:\\Windows\\System32\\vcruntime140.dll \
 	C:\\Windows\\System32\\vcruntime140_1.dll \
 	C:\\Windows\\System32\\
 
-# https://docs.mongodb.org/master/release-notes/7.0/
-ENV MONGO_VERSION 7.0.16-rc1
-# 12/03/2024, https://github.com/mongodb/mongo/tree/18b949444cfdaa88e30b0e10243bc18268251c1f
+# https://docs.mongodb.org/master/release-notes/5.0/
+ENV MONGO_VERSION 5.0.31-rc0
+# 12/19/2024, https://github.com/mongodb/mongo/tree/e341c22ae81226decb4ae08a36363c08b23d64cd
 
-COPY --from=mongo:7.0.16-rc1-windowsservercore-1809 C:\\mongodb C:\\mongodb
-RUN mongod --version
+COPY --from=mongo:5.0.31-rc0-windowsservercore-1809 C:\\mongodb C:\\mongodb
+RUN mongo --version && mongod --version
 
 VOLUME C:\\data\\db C:\\data\\configdb
 
diff --git a/mongo_7.0-rc-nanoserver-ltsc2022/Dockerfile b/mongo_5.0-rc-nanoserver-ltsc2022/Dockerfile
similarity index 68%
rename from mongo_7.0-rc-nanoserver-ltsc2022/Dockerfile
rename to mongo_5.0-rc-nanoserver-ltsc2022/Dockerfile
index 780522e..997e489 100644
--- a/mongo_7.0-rc-nanoserver-ltsc2022/Dockerfile
+++ b/mongo_5.0-rc-nanoserver-ltsc2022/Dockerfile
@@ -14,19 +14,19 @@ RUN setx /m PATH "C:\mongodb\bin;%PATH%"
 USER ContainerUser
 # doing this first to share cache across versions more aggressively
 
-COPY --from=mongo:7.0.16-rc1-windowsservercore-ltsc2022 \
+COPY --from=mongo:5.0.31-rc0-windowsservercore-ltsc2022 \
 	C:\\Windows\\System32\\msvcp140.dll \
 	C:\\Windows\\System32\\msvcp140_1.dll \
 	C:\\Windows\\System32\\vcruntime140.dll \
 	C:\\Windows\\System32\\vcruntime140_1.dll \
 	C:\\Windows\\System32\\
 
-# https://docs.mongodb.org/master/release-notes/7.0/
-ENV MONGO_VERSION 7.0.16-rc1
-# 12/03/2024, https://github.com/mongodb/mongo/tree/18b949444cfdaa88e30b0e10243bc18268251c1f
+# https://docs.mongodb.org/master/release-notes/5.0/
+ENV MONGO_VERSION 5.0.31-rc0
+# 12/19/2024, https://github.com/mongodb/mongo/tree/e341c22ae81226decb4ae08a36363c08b23d64cd
 
-COPY --from=mongo:7.0.16-rc1-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
-RUN mongod --version
+COPY --from=mongo:5.0.31-rc0-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
+RUN mongo --version && mongod --version
 
 VOLUME C:\\data\\db C:\\data\\configdb
 
diff --git a/mongo_5-windowsservercore-1809/Dockerfile b/mongo_5.0-rc-windowsservercore-1809/Dockerfile
similarity index 89%
copy from mongo_5-windowsservercore-1809/Dockerfile
copy to mongo_5.0-rc-windowsservercore-1809/Dockerfile
index 505a884..6083ff8 100644
--- a/mongo_5-windowsservercore-1809/Dockerfile
+++ b/mongo_5.0-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/5.0/
-ENV MONGO_VERSION 5.0.30
-# 10/17/2024, https://github.com/mongodb/mongo/tree/966efda23d779a86c76c34e1b13e561d68f2bb37
+ENV MONGO_VERSION 5.0.31-rc0
+# 12/19/2024, https://github.com/mongodb/mongo/tree/e341c22ae81226decb4ae08a36363c08b23d64cd
 
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-5.0.30-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=acabc07cba2e1b4a8bc2a852715a21ca29cae0f08a0dc157d54c1049f586fe45
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-5.0.31-rc0-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=96ebfde8a9540459d8a46e8ba6afabd9dc9ee61e700d8c956a6d98b78511f954
 
 RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
diff --git a/mongo_5-windowsservercore-ltsc2022/Dockerfile b/mongo_5.0-rc-windowsservercore-ltsc2022/Dockerfile
similarity index 89%
copy from mongo_5-windowsservercore-ltsc2022/Dockerfile
copy to mongo_5.0-rc-windowsservercore-ltsc2022/Dockerfile
index ac4f765..80600f0 100644
--- a/mongo_5-windowsservercore-ltsc2022/Dockerfile
+++ b/mongo_5.0-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/5.0/
-ENV MONGO_VERSION 5.0.30
-# 10/17/2024, https://github.com/mongodb/mongo/tree/966efda23d779a86c76c34e1b13e561d68f2bb37
+ENV MONGO_VERSION 5.0.31-rc0
+# 12/19/2024, https://github.com/mongodb/mongo/tree/e341c22ae81226decb4ae08a36363c08b23d64cd
 
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-5.0.30-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=acabc07cba2e1b4a8bc2a852715a21ca29cae0f08a0dc157d54c1049f586fe45
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-5.0.31-rc0-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=96ebfde8a9540459d8a46e8ba6afabd9dc9ee61e700d8c956a6d98b78511f954
 
 RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
diff --git a/mongo_7-jammy/Dockerfile b/mongo_7-jammy/Dockerfile
index 780f2a4..e5b0600 100644
--- a/mongo_7-jammy/Dockerfile
+++ b/mongo_7-jammy/Dockerfile
@@ -89,8 +89,8 @@ ENV MONGO_MAJOR 7.0
 RUN echo "deb [ signed-by=/etc/apt/keyrings/mongodb.asc ] http://$MONGO_REPO/apt/ubuntu jammy/${MONGO_PACKAGE%-unstable}/$MONGO_MAJOR multiverse" | tee "/etc/apt/sources.list.d/${MONGO_PACKAGE%-unstable}.list"
 
 # https://docs.mongodb.org/master/release-notes/7.0/
-ENV MONGO_VERSION 7.0.15
-# 10/17/2024, https://github.com/mongodb/mongo/tree/57939cc60865b0ce431c7e08c2589fa266a1a740
+ENV MONGO_VERSION 7.0.16
+# 12/11/2024, https://github.com/mongodb/mongo/tree/18b949444cfdaa88e30b0e10243bc18268251c1f
 
 RUN set -x \
 # installing "mongodb-enterprise" pulls in "tzdata" which prompts for input
diff --git a/mongo_7-nanoserver-1809/Dockerfile b/mongo_7-nanoserver-1809/Dockerfile
index a681b6f..bcb0651 100644
--- a/mongo_7-nanoserver-1809/Dockerfile
+++ b/mongo_7-nanoserver-1809/Dockerfile
@@ -14,7 +14,7 @@ RUN setx /m PATH "C:\mongodb\bin;%PATH%"
 USER ContainerUser
 # doing this first to share cache across versions more aggressively
 
-COPY --from=mongo:7.0.15-windowsservercore-1809 \
+COPY --from=mongo:7.0.16-windowsservercore-1809 \
 	C:\\Windows\\System32\\msvcp140.dll \
 	C:\\Windows\\System32\\msvcp140_1.dll \
 	C:\\Windows\\System32\\vcruntime140.dll \
@@ -22,10 +22,10 @@ COPY --from=mongo:7.0.15-windowsservercore-1809 \
 	C:\\Windows\\System32\\
 
 # https://docs.mongodb.org/master/release-notes/7.0/
-ENV MONGO_VERSION 7.0.15
-# 10/17/2024, https://github.com/mongodb/mongo/tree/57939cc60865b0ce431c7e08c2589fa266a1a740
+ENV MONGO_VERSION 7.0.16
+# 12/11/2024, https://github.com/mongodb/mongo/tree/18b949444cfdaa88e30b0e10243bc18268251c1f
 
-COPY --from=mongo:7.0.15-windowsservercore-1809 C:\\mongodb C:\\mongodb
+COPY --from=mongo:7.0.16-windowsservercore-1809 C:\\mongodb C:\\mongodb
 RUN mongod --version
 
 VOLUME C:\\data\\db C:\\data\\configdb
diff --git a/mongo_7-nanoserver-ltsc2022/Dockerfile b/mongo_7-nanoserver-ltsc2022/Dockerfile
index 3626199..0f118c3 100644
--- a/mongo_7-nanoserver-ltsc2022/Dockerfile
+++ b/mongo_7-nanoserver-ltsc2022/Dockerfile
@@ -14,7 +14,7 @@ RUN setx /m PATH "C:\mongodb\bin;%PATH%"
 USER ContainerUser
 # doing this first to share cache across versions more aggressively
 
-COPY --from=mongo:7.0.15-windowsservercore-ltsc2022 \
+COPY --from=mongo:7.0.16-windowsservercore-ltsc2022 \
 	C:\\Windows\\System32\\msvcp140.dll \
 	C:\\Windows\\System32\\msvcp140_1.dll \
 	C:\\Windows\\System32\\vcruntime140.dll \
@@ -22,10 +22,10 @@ COPY --from=mongo:7.0.15-windowsservercore-ltsc2022 \
 	C:\\Windows\\System32\\
 
 # https://docs.mongodb.org/master/release-notes/7.0/
-ENV MONGO_VERSION 7.0.15
-# 10/17/2024, https://github.com/mongodb/mongo/tree/57939cc60865b0ce431c7e08c2589fa266a1a740
+ENV MONGO_VERSION 7.0.16
+# 12/11/2024, https://github.com/mongodb/mongo/tree/18b949444cfdaa88e30b0e10243bc18268251c1f
 
-COPY --from=mongo:7.0.15-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
+COPY --from=mongo:7.0.16-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
 RUN mongod --version
 
 VOLUME C:\\data\\db C:\\data\\configdb
diff --git a/mongo_7-windowsservercore-1809/Dockerfile b/mongo_7-windowsservercore-1809/Dockerfile
index c7318ae..9f293e1 100644
--- a/mongo_7-windowsservercore-1809/Dockerfile
+++ b/mongo_7-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/7.0/
-ENV MONGO_VERSION 7.0.15
-# 10/17/2024, https://github.com/mongodb/mongo/tree/57939cc60865b0ce431c7e08c2589fa266a1a740
+ENV MONGO_VERSION 7.0.16
+# 12/11/2024, https://github.com/mongodb/mongo/tree/18b949444cfdaa88e30b0e10243bc18268251c1f
 
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-7.0.15-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=db61d1e382ab03ee98dcef1a65c4065efc4eb9eba2733852828670cfce23db3e
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-7.0.16-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=88fe05d7f324e72b9d17cbfe9bde652053c398efc7cffc0249c944faf4f32b34
 
 RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
diff --git a/mongo_7-windowsservercore-ltsc2022/Dockerfile b/mongo_7-windowsservercore-ltsc2022/Dockerfile
index f83d754..fedd067 100644
--- a/mongo_7-windowsservercore-ltsc2022/Dockerfile
+++ b/mongo_7-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/7.0/
-ENV MONGO_VERSION 7.0.15
-# 10/17/2024, https://github.com/mongodb/mongo/tree/57939cc60865b0ce431c7e08c2589fa266a1a740
+ENV MONGO_VERSION 7.0.16
+# 12/11/2024, https://github.com/mongodb/mongo/tree/18b949444cfdaa88e30b0e10243bc18268251c1f
 
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-7.0.15-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=db61d1e382ab03ee98dcef1a65c4065efc4eb9eba2733852828670cfce23db3e
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-7.0.16-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=88fe05d7f324e72b9d17cbfe9bde652053c398efc7cffc0249c944faf4f32b34
 
 RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
diff --git a/mongo_7.0-rc-windowsservercore-1809/Dockerfile b/mongo_7.0-rc-windowsservercore-1809/Dockerfile
deleted file mode 100644
index cf915cf..0000000
diff --git a/mongo_7.0-rc-windowsservercore-ltsc2022/Dockerfile b/mongo_7.0-rc-windowsservercore-ltsc2022/Dockerfile
deleted file mode 100644
index 32a2899..0000000

Relevant Maintainers:

@LaurentGoderre LaurentGoderre merged commit 231eb6e into docker-library:master Dec 23, 2024
23 checks passed
@LaurentGoderre LaurentGoderre deleted the mongo branch December 23, 2024 16:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants