Update mongo #18070
Merged
Update mongo #18070
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/mongo@207da90: Update 6.0-rc to 6.0.20-rc2
Diff for f13e95c:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 5546056..77181ea 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -69,6 +69,40 @@ GitCommit: dc976ba793b6e6c9702a961abb5edbd2d0489625
Directory: 6.0/windows/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
+Tags: 6.0.20-rc2-jammy, 6.0-rc-jammy
+SharedTags: 6.0.20-rc2, 6.0-rc
+Architectures: amd64, arm64v8
+GitCommit: 207da90e2c4682ebc65e3a3154fb8c0f2297b78c
+Directory: 6.0-rc
+
+Tags: 6.0.20-rc2-nanoserver-1809, 6.0-rc-nanoserver-1809
+SharedTags: 6.0.20-rc2-nanoserver, 6.0-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: 207da90e2c4682ebc65e3a3154fb8c0f2297b78c
+Directory: 6.0-rc/windows/nanoserver-1809
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 6.0.20-rc2-nanoserver-ltsc2022, 6.0-rc-nanoserver-ltsc2022
+SharedTags: 6.0.20-rc2-nanoserver, 6.0-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: 207da90e2c4682ebc65e3a3154fb8c0f2297b78c
+Directory: 6.0-rc/windows/nanoserver-ltsc2022
+Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
+
+Tags: 6.0.20-rc2-windowsservercore-1809, 6.0-rc-windowsservercore-1809
+SharedTags: 6.0.20-rc2-windowsservercore, 6.0-rc-windowsservercore, 6.0.20-rc2, 6.0-rc
+Architectures: windows-amd64
+GitCommit: 207da90e2c4682ebc65e3a3154fb8c0f2297b78c
+Directory: 6.0-rc/windows/windowsservercore-1809
+Constraints: windowsservercore-1809
+
+Tags: 6.0.20-rc2-windowsservercore-ltsc2022, 6.0-rc-windowsservercore-ltsc2022
+SharedTags: 6.0.20-rc2-windowsservercore, 6.0-rc-windowsservercore, 6.0.20-rc2, 6.0-rc
+Architectures: windows-amd64
+GitCommit: 207da90e2c4682ebc65e3a3154fb8c0f2297b78c
+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
Architectures: amd64, arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index 77c0392..9d78971 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -35,6 +35,14 @@ mongo:6.0-jammy
mongo:6.0-nanoserver
mongo:6.0-nanoserver-1809
mongo:6.0-nanoserver-ltsc2022
+mongo:6.0-rc
+mongo:6.0-rc-jammy
+mongo:6.0-rc-nanoserver
+mongo:6.0-rc-nanoserver-1809
+mongo:6.0-rc-nanoserver-ltsc2022
+mongo:6.0-rc-windowsservercore
+mongo:6.0-rc-windowsservercore-1809
+mongo:6.0-rc-windowsservercore-ltsc2022
mongo:6.0-windowsservercore
mongo:6.0-windowsservercore-1809
mongo:6.0-windowsservercore-ltsc2022
@@ -46,6 +54,14 @@ mongo:6.0.19-nanoserver-ltsc2022
mongo:6.0.19-windowsservercore
mongo:6.0.19-windowsservercore-1809
mongo:6.0.19-windowsservercore-ltsc2022
+mongo:6.0.20-rc2
+mongo:6.0.20-rc2-jammy
+mongo:6.0.20-rc2-nanoserver
+mongo:6.0.20-rc2-nanoserver-1809
+mongo:6.0.20-rc2-nanoserver-ltsc2022
+mongo:6.0.20-rc2-windowsservercore
+mongo:6.0.20-rc2-windowsservercore-1809
+mongo:6.0.20-rc2-windowsservercore-ltsc2022
mongo:7
mongo:7-jammy
mongo:7-nanoserver
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index ace19f2..03bb2db 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -4,6 +4,9 @@ mongo:5-windowsservercore-ltsc2022
mongo:6-jammy
mongo:6-windowsservercore-1809
mongo:6-windowsservercore-ltsc2022
+mongo:6.0-rc-jammy
+mongo:6.0-rc-windowsservercore-1809
+mongo:6.0-rc-windowsservercore-ltsc2022
mongo:7-jammy
mongo:7-windowsservercore-1809
mongo:7-windowsservercore-ltsc2022
@@ -17,6 +20,8 @@ mongo:5-nanoserver-1809
mongo:5-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
diff --git a/mongo_7.0-rc-jammy/Dockerfile b/mongo_6.0-rc-jammy/Dockerfile
similarity index 91%
copy from mongo_7.0-rc-jammy/Dockerfile
copy to mongo_6.0-rc-jammy/Dockerfile
index 1f127ec..c3bc4cf 100644
--- a/mongo_7.0-rc-jammy/Dockerfile
+++ b/mongo_6.0-rc-jammy/Dockerfile
@@ -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-6.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' '39BD841E4BE5FB195A65400E6A26B1AE64C3C388' > /etc/apt/keyrings/mongodb.asc; \
gpgconf --kill all; \
rm -rf "$GNUPGHOME" KEYS; \
\
@@ -88,11 +88,11 @@ 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"
# 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 jammy/${MONGO_PACKAGE%-unstable}/6.0 multiverse" | tee "/etc/apt/sources.list.d/mongodb-6.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/6.0/
+ENV MONGO_VERSION 6.0.20~rc2
+# 12/10/2024, https://github.com/mongodb/mongo/tree/61f4e55f215c0d7e5c461160a4429c744262debf
RUN set -x \
# installing "mongodb-enterprise" pulls in "tzdata" which prompts for input
diff --git a/mongo_5-focal/docker-entrypoint.sh b/mongo_6.0-rc-jammy/docker-entrypoint.sh
similarity index 100%
copy from mongo_5-focal/docker-entrypoint.sh
copy to mongo_6.0-rc-jammy/docker-entrypoint.sh
diff --git a/mongo_6-nanoserver-1809/Dockerfile b/mongo_6.0-rc-nanoserver-1809/Dockerfile
similarity index 75%
copy from mongo_6-nanoserver-1809/Dockerfile
copy to mongo_6.0-rc-nanoserver-1809/Dockerfile
index b55c90e..c628c58 100644
--- a/mongo_6-nanoserver-1809/Dockerfile
+++ b/mongo_6.0-rc-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:6.0.19-windowsservercore-1809 \
+COPY --from=mongo:6.0.20-rc2-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:6.0.19-windowsservercore-1809 \
C:\\Windows\\System32\\
# https://docs.mongodb.org/master/release-notes/6.0/
-ENV MONGO_VERSION 6.0.19
-# 10/17/2024, https://github.com/mongodb/mongo/tree/a7ada5ff3a4d8a1e2ed88f86bd6b3d1d16cb43c6
+ENV MONGO_VERSION 6.0.20-rc2
+# 12/10/2024, https://github.com/mongodb/mongo/tree/61f4e55f215c0d7e5c461160a4429c744262debf
-COPY --from=mongo:6.0.19-windowsservercore-1809 C:\\mongodb C:\\mongodb
+COPY --from=mongo:6.0.20-rc2-windowsservercore-1809 C:\\mongodb C:\\mongodb
RUN mongod --version
VOLUME C:\\data\\db C:\\data\\configdb
diff --git a/mongo_6-nanoserver-ltsc2022/Dockerfile b/mongo_6.0-rc-nanoserver-ltsc2022/Dockerfile
similarity index 75%
copy from mongo_6-nanoserver-ltsc2022/Dockerfile
copy to mongo_6.0-rc-nanoserver-ltsc2022/Dockerfile
index 88e9114..01bb95c 100644
--- a/mongo_6-nanoserver-ltsc2022/Dockerfile
+++ b/mongo_6.0-rc-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:6.0.19-windowsservercore-ltsc2022 \
+COPY --from=mongo:6.0.20-rc2-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:6.0.19-windowsservercore-ltsc2022 \
C:\\Windows\\System32\\
# https://docs.mongodb.org/master/release-notes/6.0/
-ENV MONGO_VERSION 6.0.19
-# 10/17/2024, https://github.com/mongodb/mongo/tree/a7ada5ff3a4d8a1e2ed88f86bd6b3d1d16cb43c6
+ENV MONGO_VERSION 6.0.20-rc2
+# 12/10/2024, https://github.com/mongodb/mongo/tree/61f4e55f215c0d7e5c461160a4429c744262debf
-COPY --from=mongo:6.0.19-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
+COPY --from=mongo:6.0.20-rc2-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
RUN mongod --version
VOLUME C:\\data\\db C:\\data\\configdb
diff --git a/mongo_6-windowsservercore-1809/Dockerfile b/mongo_6.0-rc-windowsservercore-1809/Dockerfile
similarity index 89%
copy from mongo_6-windowsservercore-1809/Dockerfile
copy to mongo_6.0-rc-windowsservercore-1809/Dockerfile
index 04fd528..2686348 100644
--- a/mongo_6-windowsservercore-1809/Dockerfile
+++ b/mongo_6.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/6.0/
-ENV MONGO_VERSION 6.0.19
-# 10/17/2024, https://github.com/mongodb/mongo/tree/a7ada5ff3a4d8a1e2ed88f86bd6b3d1d16cb43c6
+ENV MONGO_VERSION 6.0.20-rc2
+# 12/10/2024, https://github.com/mongodb/mongo/tree/61f4e55f215c0d7e5c461160a4429c744262debf
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-6.0.19-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=2d9f5555d820c1b6a3f3177f0a73a4f9e9b3a7f1275d2aa3122a2ecc3a1b31a2
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-6.0.20-rc2-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=f7d3087e3d0f441b45a19c34ffc513b9ab472d1312796d3b8ac6411246d7aee5
RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
diff --git a/mongo_6-windowsservercore-ltsc2022/Dockerfile b/mongo_6.0-rc-windowsservercore-ltsc2022/Dockerfile
similarity index 89%
copy from mongo_6-windowsservercore-ltsc2022/Dockerfile
copy to mongo_6.0-rc-windowsservercore-ltsc2022/Dockerfile
index 080655a..a06277e 100644
--- a/mongo_6-windowsservercore-ltsc2022/Dockerfile
+++ b/mongo_6.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/6.0/
-ENV MONGO_VERSION 6.0.19
-# 10/17/2024, https://github.com/mongodb/mongo/tree/a7ada5ff3a4d8a1e2ed88f86bd6b3d1d16cb43c6
+ENV MONGO_VERSION 6.0.20-rc2
+# 12/10/2024, https://github.com/mongodb/mongo/tree/61f4e55f215c0d7e5c461160a4429c744262debf
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-6.0.19-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=2d9f5555d820c1b6a3f3177f0a73a4f9e9b3a7f1275d2aa3122a2ecc3a1b31a2
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-6.0.20-rc2-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=f7d3087e3d0f441b45a19c34ffc513b9ab472d1312796d3b8ac6411246d7aee5
RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \Relevant Maintainers: |
tianon
approved these changes
Dec 11, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: