-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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 #17969
Merged
Merged
Update mongo #17969
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@25072a0: Update 8.0-rc to 8.0.4-rc0 - docker-library/mongo@006967c: Update README
Diff for 2d7fabc:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 690acbc..6fbdfec 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -136,3 +136,37 @@ Architectures: windows-amd64
GitCommit: a0b18e58a944f41c8a02bf97d8a811917f8ca62b
Directory: 8.0/windows/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
+
+Tags: 8.0.4-rc0-nanoserver-1809, 8.0-rc-nanoserver-1809
+SharedTags: 8.0.4-rc0-nanoserver, 8.0-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: 25072a0ca59d0cc65dbf948b53b6c438de53d646
+Directory: 8.0-rc/windows/nanoserver-1809
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 8.0.4-rc0-nanoserver-ltsc2022, 8.0-rc-nanoserver-ltsc2022
+SharedTags: 8.0.4-rc0-nanoserver, 8.0-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: 25072a0ca59d0cc65dbf948b53b6c438de53d646
+Directory: 8.0-rc/windows/nanoserver-ltsc2022
+Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
+
+Tags: 8.0.4-rc0-noble, 8.0-rc-noble
+SharedTags: 8.0.4-rc0, 8.0-rc
+Architectures: amd64, arm64v8
+GitCommit: 25072a0ca59d0cc65dbf948b53b6c438de53d646
+Directory: 8.0-rc
+
+Tags: 8.0.4-rc0-windowsservercore-1809, 8.0-rc-windowsservercore-1809
+SharedTags: 8.0.4-rc0-windowsservercore, 8.0-rc-windowsservercore, 8.0.4-rc0, 8.0-rc
+Architectures: windows-amd64
+GitCommit: 25072a0ca59d0cc65dbf948b53b6c438de53d646
+Directory: 8.0-rc/windows/windowsservercore-1809
+Constraints: windowsservercore-1809
+
+Tags: 8.0.4-rc0-windowsservercore-ltsc2022, 8.0-rc-windowsservercore-ltsc2022
+SharedTags: 8.0.4-rc0-windowsservercore, 8.0-rc-windowsservercore, 8.0.4-rc0, 8.0-rc
+Architectures: windows-amd64
+GitCommit: 25072a0ca59d0cc65dbf948b53b6c438de53d646
+Directory: 8.0-rc/windows/windowsservercore-ltsc2022
+Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 94d018e..2f7d7eb 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -83,6 +83,14 @@ mongo:8.0-nanoserver
mongo:8.0-nanoserver-1809
mongo:8.0-nanoserver-ltsc2022
mongo:8.0-noble
+mongo:8.0-rc
+mongo:8.0-rc-nanoserver
+mongo:8.0-rc-nanoserver-1809
+mongo:8.0-rc-nanoserver-ltsc2022
+mongo:8.0-rc-noble
+mongo:8.0-rc-windowsservercore
+mongo:8.0-rc-windowsservercore-1809
+mongo:8.0-rc-windowsservercore-ltsc2022
mongo:8.0-windowsservercore
mongo:8.0-windowsservercore-1809
mongo:8.0-windowsservercore-ltsc2022
@@ -94,6 +102,14 @@ mongo:8.0.3-noble
mongo:8.0.3-windowsservercore
mongo:8.0.3-windowsservercore-1809
mongo:8.0.3-windowsservercore-ltsc2022
+mongo:8.0.4-rc0
+mongo:8.0.4-rc0-nanoserver
+mongo:8.0.4-rc0-nanoserver-1809
+mongo:8.0.4-rc0-nanoserver-ltsc2022
+mongo:8.0.4-rc0-noble
+mongo:8.0.4-rc0-windowsservercore
+mongo:8.0.4-rc0-windowsservercore-1809
+mongo:8.0.4-rc0-windowsservercore-ltsc2022
mongo:latest
mongo:nanoserver
mongo:nanoserver-1809
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 62c90e4..ec4a218 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -7,6 +7,9 @@ mongo:6-windowsservercore-ltsc2022
mongo:7-jammy
mongo:7-windowsservercore-1809
mongo:7-windowsservercore-ltsc2022
+mongo:8.0-rc-noble
+mongo:8.0-rc-windowsservercore-1809
+mongo:8.0-rc-windowsservercore-ltsc2022
mongo:noble
mongo:windowsservercore-1809
mongo:windowsservercore-ltsc2022
@@ -16,5 +19,7 @@ mongo:6-nanoserver-1809
mongo:6-nanoserver-ltsc2022
mongo:7-nanoserver-1809
mongo:7-nanoserver-ltsc2022
+mongo:8.0-rc-nanoserver-1809
+mongo:8.0-rc-nanoserver-ltsc2022
mongo:nanoserver-1809
mongo:nanoserver-ltsc2022
diff --git a/mongo_nanoserver-1809/Dockerfile b/mongo_8.0-rc-nanoserver-1809/Dockerfile
similarity index 75%
copy from mongo_nanoserver-1809/Dockerfile
copy to mongo_8.0-rc-nanoserver-1809/Dockerfile
index 07ce366..c953f29 100644
--- a/mongo_nanoserver-1809/Dockerfile
+++ b/mongo_8.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:8.0.3-windowsservercore-1809 \
+COPY --from=mongo:8.0.4-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:8.0.3-windowsservercore-1809 \
C:\\Windows\\System32\\
# https://docs.mongodb.org/master/release-notes/8.0/
-ENV MONGO_VERSION 8.0.3
-# 10/17/2024, https://github.com/mongodb/mongo/tree/89d97f2744a2b9851ddfb51bdf22f687562d9b06
+ENV MONGO_VERSION 8.0.4-rc0
+# 11/20/2024, https://github.com/mongodb/mongo/tree/bc35ab4305d9920d9d0491c1c9ef9b72383d31f9
-COPY --from=mongo:8.0.3-windowsservercore-1809 C:\\mongodb C:\\mongodb
+COPY --from=mongo:8.0.4-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_8.0-rc-nanoserver-ltsc2022/Dockerfile
similarity index 75%
copy from mongo_nanoserver-ltsc2022/Dockerfile
copy to mongo_8.0-rc-nanoserver-ltsc2022/Dockerfile
index c8ab89a..35dca0d 100644
--- a/mongo_nanoserver-ltsc2022/Dockerfile
+++ b/mongo_8.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:8.0.3-windowsservercore-ltsc2022 \
+COPY --from=mongo:8.0.4-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:8.0.3-windowsservercore-ltsc2022 \
C:\\Windows\\System32\\
# https://docs.mongodb.org/master/release-notes/8.0/
-ENV MONGO_VERSION 8.0.3
-# 10/17/2024, https://github.com/mongodb/mongo/tree/89d97f2744a2b9851ddfb51bdf22f687562d9b06
+ENV MONGO_VERSION 8.0.4-rc0
+# 11/20/2024, https://github.com/mongodb/mongo/tree/bc35ab4305d9920d9d0491c1c9ef9b72383d31f9
-COPY --from=mongo:8.0.3-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
+COPY --from=mongo:8.0.4-rc0-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
RUN mongod --version
VOLUME C:\\data\\db C:\\data\\configdb
diff --git a/mongo_noble/Dockerfile b/mongo_8.0-rc-noble/Dockerfile
similarity index 86%
copy from mongo_noble/Dockerfile
copy to mongo_8.0-rc-noble/Dockerfile
index 7c59dcc..0db05d4 100644
--- a/mongo_noble/Dockerfile
+++ b/mongo_8.0-rc-noble/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-8.0.asc'; \
+ wget -O KEYS 'https://pgp.mongodb.com/server-dev.asc' 'https://pgp.mongodb.com/server-8.0.asc'; \
gpg --batch --import KEYS; \
mkdir -p /etc/apt/keyrings; \
- gpg --batch --export --armor '4B0752C1BCA238C0B4EE14DC41DE058A4E7DCA05' > /etc/apt/keyrings/mongodb.asc; \
+ gpg --batch --export --armor '28DE23AF08040FB24C33F36381B0EBBBADCEA95C' '4B0752C1BCA238C0B4EE14DC41DE058A4E7DCA05' > /etc/apt/keyrings/mongodb.asc; \
gpgconf --kill all; \
rm -rf "$GNUPGHOME" KEYS; \
\
@@ -85,12 +85,14 @@ ARG MONGO_PACKAGE=mongodb-org
ARG MONGO_REPO=repo.mongodb.org
ENV MONGO_PACKAGE=${MONGO_PACKAGE} MONGO_REPO=${MONGO_REPO}
-ENV MONGO_MAJOR 8.0
+ENV MONGO_MAJOR testing
RUN echo "deb [ signed-by=/etc/apt/keyrings/mongodb.asc ] http://$MONGO_REPO/apt/ubuntu noble/${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 noble/${MONGO_PACKAGE%-unstable}/8.0 multiverse" | tee "/etc/apt/sources.list.d/mongodb-8.0.list"
# https://docs.mongodb.org/master/release-notes/8.0/
-ENV MONGO_VERSION 8.0.3
-# 10/17/2024, https://github.com/mongodb/mongo/tree/89d97f2744a2b9851ddfb51bdf22f687562d9b06
+ENV MONGO_VERSION 8.0.4~rc0
+# 11/20/2024, https://github.com/mongodb/mongo/tree/bc35ab4305d9920d9d0491c1c9ef9b72383d31f9
RUN set -x \
# installing "mongodb-enterprise" pulls in "tzdata" which prompts for input
diff --git a/mongo_5-focal/docker-entrypoint.sh b/mongo_8.0-rc-noble/docker-entrypoint.sh
similarity index 100%
copy from mongo_5-focal/docker-entrypoint.sh
copy to mongo_8.0-rc-noble/docker-entrypoint.sh
diff --git a/mongo_windowsservercore-1809/Dockerfile b/mongo_8.0-rc-windowsservercore-1809/Dockerfile
similarity index 89%
copy from mongo_windowsservercore-1809/Dockerfile
copy to mongo_8.0-rc-windowsservercore-1809/Dockerfile
index 96ac478..1ee67d4 100644
--- a/mongo_windowsservercore-1809/Dockerfile
+++ b/mongo_8.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/8.0/
-ENV MONGO_VERSION 8.0.3
-# 10/17/2024, https://github.com/mongodb/mongo/tree/89d97f2744a2b9851ddfb51bdf22f687562d9b06
+ENV MONGO_VERSION 8.0.4-rc0
+# 11/20/2024, https://github.com/mongodb/mongo/tree/bc35ab4305d9920d9d0491c1c9ef9b72383d31f9
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-8.0.3-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=f064b0d5096136a70edd9a4a1c17d23c78f62600ba860512523eee2206a018b9
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-8.0.4-rc0-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=d9e58da185196ee82523cb63450b975fa01bc2f5234a340e4cc95cbb4f9187b4
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_8.0-rc-windowsservercore-ltsc2022/Dockerfile
similarity index 89%
copy from mongo_windowsservercore-ltsc2022/Dockerfile
copy to mongo_8.0-rc-windowsservercore-ltsc2022/Dockerfile
index cc67903..6db50c9 100644
--- a/mongo_windowsservercore-ltsc2022/Dockerfile
+++ b/mongo_8.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/8.0/
-ENV MONGO_VERSION 8.0.3
-# 10/17/2024, https://github.com/mongodb/mongo/tree/89d97f2744a2b9851ddfb51bdf22f687562d9b06
+ENV MONGO_VERSION 8.0.4-rc0
+# 11/20/2024, https://github.com/mongodb/mongo/tree/bc35ab4305d9920d9d0491c1c9ef9b72383d31f9
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-8.0.3-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=f064b0d5096136a70edd9a4a1c17d23c78f62600ba860512523eee2206a018b9
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-8.0.4-rc0-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=d9e58da185196ee82523cb63450b975fa01bc2f5234a340e4cc95cbb4f9187b4
RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ Relevant Maintainers: |
yosifkit
approved these changes
Nov 25, 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: