Update mongo #17314
Merged
Update mongo #17314
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@2f67df0: Update 7.0-rc to 7.0.13-rc0
Diff for eb79974:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6c73e69..4f97029 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -103,6 +103,40 @@ GitCommit: 4cf85e870b1306f91472ba1cb0be14a298ffb333
Directory: 7.0/windows/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
+Tags: 7.0.13-rc0-jammy, 7.0-rc-jammy
+SharedTags: 7.0.13-rc0, 7.0-rc
+Architectures: amd64, arm64v8
+GitCommit: 2f67df06afba874f83a82d71a2622c9317be1e2f
+Directory: 7.0-rc
+
+Tags: 7.0.13-rc0-nanoserver-1809, 7.0-rc-nanoserver-1809
+SharedTags: 7.0.13-rc0-nanoserver, 7.0-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: 2f67df06afba874f83a82d71a2622c9317be1e2f
+Directory: 7.0-rc/windows/nanoserver-1809
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 7.0.13-rc0-nanoserver-ltsc2022, 7.0-rc-nanoserver-ltsc2022
+SharedTags: 7.0.13-rc0-nanoserver, 7.0-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: 2f67df06afba874f83a82d71a2622c9317be1e2f
+Directory: 7.0-rc/windows/nanoserver-ltsc2022
+Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
+
+Tags: 7.0.13-rc0-windowsservercore-1809, 7.0-rc-windowsservercore-1809
+SharedTags: 7.0.13-rc0-windowsservercore, 7.0-rc-windowsservercore, 7.0.13-rc0, 7.0-rc
+Architectures: windows-amd64
+GitCommit: 2f67df06afba874f83a82d71a2622c9317be1e2f
+Directory: 7.0-rc/windows/windowsservercore-1809
+Constraints: windowsservercore-1809
+
+Tags: 7.0.13-rc0-windowsservercore-ltsc2022, 7.0-rc-windowsservercore-ltsc2022
+SharedTags: 7.0.13-rc0-windowsservercore, 7.0-rc-windowsservercore, 7.0.13-rc0, 7.0-rc
+Architectures: windows-amd64
+GitCommit: 2f67df06afba874f83a82d71a2622c9317be1e2f
+Directory: 7.0-rc/windows/windowsservercore-ltsc2022
+Constraints: windowsservercore-ltsc2022
+
Tags: 8.0.0-rc16-jammy, 8.0-rc-jammy
SharedTags: 8.0.0-rc16, 8.0-rc
Architectures: amd64, arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index 0a4538d..b43601d 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -59,6 +59,14 @@ 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
@@ -70,6 +78,14 @@ mongo:7.0.12-nanoserver-ltsc2022
mongo:7.0.12-windowsservercore
mongo:7.0.12-windowsservercore-1809
mongo:7.0.12-windowsservercore-ltsc2022
+mongo:7.0.13-rc0
+mongo:7.0.13-rc0-jammy
+mongo:7.0.13-rc0-nanoserver
+mongo:7.0.13-rc0-nanoserver-1809
+mongo:7.0.13-rc0-nanoserver-ltsc2022
+mongo:7.0.13-rc0-windowsservercore
+mongo:7.0.13-rc0-windowsservercore-1809
+mongo:7.0.13-rc0-windowsservercore-ltsc2022
mongo:8.0-rc
mongo:8.0-rc-jammy
mongo:8.0-rc-nanoserver
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index b668c26..2b6e4b8 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:7.0-rc-jammy
+mongo:7.0-rc-windowsservercore-1809
+mongo:7.0-rc-windowsservercore-ltsc2022
mongo:8.0-rc-jammy
mongo:8.0-rc-windowsservercore-1809
mongo:8.0-rc-windowsservercore-ltsc2022
@@ -14,6 +17,8 @@ mongo:5-nanoserver-1809
mongo:5-nanoserver-ltsc2022
mongo:6-nanoserver-1809
mongo:6-nanoserver-ltsc2022
+mongo:7.0-rc-nanoserver-1809
+mongo:7.0-rc-nanoserver-ltsc2022
mongo:8.0-rc-nanoserver-1809
mongo:8.0-rc-nanoserver-ltsc2022
mongo:nanoserver-1809
diff --git a/mongo_8.0-rc-jammy/Dockerfile b/mongo_7.0-rc-jammy/Dockerfile
similarity index 88%
copy from mongo_8.0-rc-jammy/Dockerfile
copy to mongo_7.0-rc-jammy/Dockerfile
index af40d15..0168c10 100644
--- a/mongo_8.0-rc-jammy/Dockerfile
+++ b/mongo_7.0-rc-jammy/Dockerfile
@@ -57,10 +57,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' 'https://pgp.mongodb.com/server-8.0.asc'; \
+ wget -O KEYS 'https://pgp.mongodb.com/server-dev.asc' 'https://pgp.mongodb.com/server-7.0.asc'; \
gpg --batch --import KEYS; \
mkdir -p /etc/apt/keyrings; \
- gpg --batch --export --armor '28DE23AF08040FB24C33F36381B0EBBBADCEA95C' 'E58830201F7DD82CD808AA84160D26BB1785BA38' '4B0752C1BCA238C0B4EE14DC41DE058A4E7DCA05' > /etc/apt/keyrings/mongodb.asc; \
+ gpg --batch --export --armor '28DE23AF08040FB24C33F36381B0EBBBADCEA95C' 'E58830201F7DD82CD808AA84160D26BB1785BA38' > /etc/apt/keyrings/mongodb.asc; \
gpgconf --kill all; \
rm -rf "$GNUPGHOME" KEYS; \
\
@@ -85,12 +85,12 @@ 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"
-# 8.0 is not GA, so we need the previous release 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-previous.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"
-# https://docs.mongodb.org/master/release-notes/8.0/
-ENV MONGO_VERSION 8.0.0~rc16
-# 08/03/2024, https://github.com/mongodb/mongo/tree/c05b57203089bb276c31ab34dfc538f1da972a36
+# https://docs.mongodb.org/master/release-notes/7.0/
+ENV MONGO_VERSION 7.0.13~rc0
+# 08/05/2024, https://github.com/mongodb/mongo/tree/1628203bd5754119e4c3f4324c8cf25eb3bc75aa
RUN set -x \
# installing "mongodb-enterprise" pulls in "tzdata" which prompts for input
diff --git a/mongo_5-focal/docker-entrypoint.sh b/mongo_7.0-rc-jammy/docker-entrypoint.sh
similarity index 100%
copy from mongo_5-focal/docker-entrypoint.sh
copy to mongo_7.0-rc-jammy/docker-entrypoint.sh
diff --git a/mongo_nanoserver-1809/Dockerfile b/mongo_7.0-rc-nanoserver-1809/Dockerfile
similarity index 75%
copy from mongo_nanoserver-1809/Dockerfile
copy to mongo_7.0-rc-nanoserver-1809/Dockerfile
index d4d83ad..92ab5a7 100644
--- a/mongo_nanoserver-1809/Dockerfile
+++ b/mongo_7.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:7.0.12-windowsservercore-1809 \
+COPY --from=mongo:7.0.13-rc0-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.12-windowsservercore-1809 \
C:\\Windows\\System32\\
# https://docs.mongodb.org/master/release-notes/7.0/
-ENV MONGO_VERSION 7.0.12
-# 06/25/2024, https://github.com/mongodb/mongo/tree/b6513ce0781db6818e24619e8a461eae90bc94fc
+ENV MONGO_VERSION 7.0.13-rc0
+# 08/05/2024, https://github.com/mongodb/mongo/tree/1628203bd5754119e4c3f4324c8cf25eb3bc75aa
-COPY --from=mongo:7.0.12-windowsservercore-1809 C:\\mongodb C:\\mongodb
+COPY --from=mongo:7.0.13-rc0-windowsservercore-1809 C:\\mongodb C:\\mongodb
RUN mongod --version
VOLUME C:\\data\\db C:\\data\\configdb
diff --git a/mongo_nanoserver-ltsc2022/Dockerfile b/mongo_7.0-rc-nanoserver-ltsc2022/Dockerfile
similarity index 75%
copy from mongo_nanoserver-ltsc2022/Dockerfile
copy to mongo_7.0-rc-nanoserver-ltsc2022/Dockerfile
index 316d216..b6295cc 100644
--- a/mongo_nanoserver-ltsc2022/Dockerfile
+++ b/mongo_7.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:7.0.12-windowsservercore-ltsc2022 \
+COPY --from=mongo:7.0.13-rc0-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.12-windowsservercore-ltsc2022 \
C:\\Windows\\System32\\
# https://docs.mongodb.org/master/release-notes/7.0/
-ENV MONGO_VERSION 7.0.12
-# 06/25/2024, https://github.com/mongodb/mongo/tree/b6513ce0781db6818e24619e8a461eae90bc94fc
+ENV MONGO_VERSION 7.0.13-rc0
+# 08/05/2024, https://github.com/mongodb/mongo/tree/1628203bd5754119e4c3f4324c8cf25eb3bc75aa
-COPY --from=mongo:7.0.12-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
+COPY --from=mongo:7.0.13-rc0-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
RUN mongod --version
VOLUME C:\\data\\db C:\\data\\configdb
diff --git a/mongo_windowsservercore-1809/Dockerfile b/mongo_7.0-rc-windowsservercore-1809/Dockerfile
similarity index 89%
copy from mongo_windowsservercore-1809/Dockerfile
copy to mongo_7.0-rc-windowsservercore-1809/Dockerfile
index 6244aa1..0377e51 100644
--- a/mongo_windowsservercore-1809/Dockerfile
+++ b/mongo_7.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/7.0/
-ENV MONGO_VERSION 7.0.12
-# 06/25/2024, https://github.com/mongodb/mongo/tree/b6513ce0781db6818e24619e8a461eae90bc94fc
+ENV MONGO_VERSION 7.0.13-rc0
+# 08/05/2024, https://github.com/mongodb/mongo/tree/1628203bd5754119e4c3f4324c8cf25eb3bc75aa
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-7.0.12-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=314f1b988490d46c9831cbf7ad7669a949507df17cc0674f7bdac47de74281b1
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-7.0.13-rc0-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=86b878731b6d156dee7e6511a41db92b4cb57bff08fe011ba0e6c38264b91bf2
RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
diff --git a/mongo_windowsservercore-ltsc2022/Dockerfile b/mongo_7.0-rc-windowsservercore-ltsc2022/Dockerfile
similarity index 89%
copy from mongo_windowsservercore-ltsc2022/Dockerfile
copy to mongo_7.0-rc-windowsservercore-ltsc2022/Dockerfile
index c95ad0f..941580d 100644
--- a/mongo_windowsservercore-ltsc2022/Dockerfile
+++ b/mongo_7.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/7.0/
-ENV MONGO_VERSION 7.0.12
-# 06/25/2024, https://github.com/mongodb/mongo/tree/b6513ce0781db6818e24619e8a461eae90bc94fc
+ENV MONGO_VERSION 7.0.13-rc0
+# 08/05/2024, https://github.com/mongodb/mongo/tree/1628203bd5754119e4c3f4324c8cf25eb3bc75aa
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-7.0.12-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=314f1b988490d46c9831cbf7ad7669a949507df17cc0674f7bdac47de74281b1
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-7.0.13-rc0-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=86b878731b6d156dee7e6511a41db92b4cb57bff08fe011ba0e6c38264b91bf2
RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \Relevant Maintainers: |
yosifkit
approved these changes
Aug 6, 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: