Update mongo #16771
Merged
Update mongo #16771
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@7566651: Merge pull request docker-library/mongo#694 from infosiftr/8.0-rc - docker-library/mongo@4fc70d4: Add 8.0.0-rc4 - docker-library/mongo@317a3a9: Remove more 4.4 references (now that it is EOL) - docker-library/mongo@74f765f: Update 4.4
Diff for 6042e17:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 81231f0..395dd0f 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,40 +1,6 @@
Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
GitRepo: https://github.com/docker-library/mongo.git
-Tags: 4.4.29-focal, 4.4-focal, 4-focal
-SharedTags: 4.4.29, 4.4, 4
-Architectures: amd64, arm64v8
-GitCommit: 2ce02fe52826bae7c03f3f20817370396052c925
-Directory: 4.4
-
-Tags: 4.4.29-nanoserver-1809, 4.4-nanoserver-1809, 4-nanoserver-1809
-SharedTags: 4.4.29-nanoserver, 4.4-nanoserver, 4-nanoserver
-Architectures: windows-amd64
-GitCommit: 2ce02fe52826bae7c03f3f20817370396052c925
-Directory: 4.4/windows/nanoserver-1809
-Constraints: nanoserver-1809, windowsservercore-1809
-
-Tags: 4.4.29-nanoserver-ltsc2022, 4.4-nanoserver-ltsc2022, 4-nanoserver-ltsc2022
-SharedTags: 4.4.29-nanoserver, 4.4-nanoserver, 4-nanoserver
-Architectures: windows-amd64
-GitCommit: 2ce02fe52826bae7c03f3f20817370396052c925
-Directory: 4.4/windows/nanoserver-ltsc2022
-Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
-
-Tags: 4.4.29-windowsservercore-1809, 4.4-windowsservercore-1809, 4-windowsservercore-1809
-SharedTags: 4.4.29-windowsservercore, 4.4-windowsservercore, 4-windowsservercore, 4.4.29, 4.4, 4
-Architectures: windows-amd64
-GitCommit: 2ce02fe52826bae7c03f3f20817370396052c925
-Directory: 4.4/windows/windowsservercore-1809
-Constraints: windowsservercore-1809
-
-Tags: 4.4.29-windowsservercore-ltsc2022, 4.4-windowsservercore-ltsc2022, 4-windowsservercore-ltsc2022
-SharedTags: 4.4.29-windowsservercore, 4.4-windowsservercore, 4-windowsservercore, 4.4.29, 4.4, 4
-Architectures: windows-amd64
-GitCommit: 2ce02fe52826bae7c03f3f20817370396052c925
-Directory: 4.4/windows/windowsservercore-ltsc2022
-Constraints: windowsservercore-ltsc2022
-
Tags: 5.0.26-focal, 5.0-focal, 5-focal
SharedTags: 5.0.26, 5.0, 5
Architectures: amd64, arm64v8
@@ -170,3 +136,37 @@ Architectures: windows-amd64
GitCommit: de0ea748e028bbb029beeb2a2a16995f52b8d870
Directory: 7.0-rc/windows/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
+
+Tags: 8.0.0-rc4-jammy, 8.0-rc-jammy
+SharedTags: 8.0.0-rc4, 8.0-rc
+Architectures: amd64, arm64v8
+GitCommit: 4fc70d45bda4a5d142b875b5f044a94af29a071d
+Directory: 8.0-rc
+
+Tags: 8.0.0-rc4-nanoserver-1809, 8.0-rc-nanoserver-1809
+SharedTags: 8.0.0-rc4-nanoserver, 8.0-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: 4fc70d45bda4a5d142b875b5f044a94af29a071d
+Directory: 8.0-rc/windows/nanoserver-1809
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 8.0.0-rc4-nanoserver-ltsc2022, 8.0-rc-nanoserver-ltsc2022
+SharedTags: 8.0.0-rc4-nanoserver, 8.0-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: 4fc70d45bda4a5d142b875b5f044a94af29a071d
+Directory: 8.0-rc/windows/nanoserver-ltsc2022
+Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
+
+Tags: 8.0.0-rc4-windowsservercore-1809, 8.0-rc-windowsservercore-1809
+SharedTags: 8.0.0-rc4-windowsservercore, 8.0-rc-windowsservercore, 8.0.0-rc4, 8.0-rc
+Architectures: windows-amd64
+GitCommit: 4fc70d45bda4a5d142b875b5f044a94af29a071d
+Directory: 8.0-rc/windows/windowsservercore-1809
+Constraints: windowsservercore-1809
+
+Tags: 8.0.0-rc4-windowsservercore-ltsc2022, 8.0-rc-windowsservercore-ltsc2022
+SharedTags: 8.0.0-rc4-windowsservercore, 8.0-rc-windowsservercore, 8.0.0-rc4, 8.0-rc
+Architectures: windows-amd64
+GitCommit: 4fc70d45bda4a5d142b875b5f044a94af29a071d
+Directory: 8.0-rc/windows/windowsservercore-ltsc2022
+Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 522d3d6..1887bd8 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,27 +1,3 @@
-mongo:4
-mongo:4-focal
-mongo:4-nanoserver
-mongo:4-nanoserver-1809
-mongo:4-nanoserver-ltsc2022
-mongo:4-windowsservercore
-mongo:4-windowsservercore-1809
-mongo:4-windowsservercore-ltsc2022
-mongo:4.4
-mongo:4.4-focal
-mongo:4.4-nanoserver
-mongo:4.4-nanoserver-1809
-mongo:4.4-nanoserver-ltsc2022
-mongo:4.4-windowsservercore
-mongo:4.4-windowsservercore-1809
-mongo:4.4-windowsservercore-ltsc2022
-mongo:4.4.29
-mongo:4.4.29-focal
-mongo:4.4.29-nanoserver
-mongo:4.4.29-nanoserver-1809
-mongo:4.4.29-nanoserver-ltsc2022
-mongo:4.4.29-windowsservercore
-mongo:4.4.29-windowsservercore-1809
-mongo:4.4.29-windowsservercore-ltsc2022
mongo:5
mongo:5-focal
mongo:5-nanoserver
@@ -110,6 +86,22 @@ mongo:7.0.10-rc0-nanoserver-ltsc2022
mongo:7.0.10-rc0-windowsservercore
mongo:7.0.10-rc0-windowsservercore-1809
mongo:7.0.10-rc0-windowsservercore-ltsc2022
+mongo:8.0-rc
+mongo:8.0-rc-jammy
+mongo:8.0-rc-nanoserver
+mongo:8.0-rc-nanoserver-1809
+mongo:8.0-rc-nanoserver-ltsc2022
+mongo:8.0-rc-windowsservercore
+mongo:8.0-rc-windowsservercore-1809
+mongo:8.0-rc-windowsservercore-ltsc2022
+mongo:8.0.0-rc4
+mongo:8.0.0-rc4-jammy
+mongo:8.0.0-rc4-nanoserver
+mongo:8.0.0-rc4-nanoserver-1809
+mongo:8.0.0-rc4-nanoserver-ltsc2022
+mongo:8.0.0-rc4-windowsservercore
+mongo:8.0.0-rc4-windowsservercore-1809
+mongo:8.0.0-rc4-windowsservercore-ltsc2022
mongo:jammy
mongo:latest
mongo:nanoserver
diff --git a/mongo_4-focal/Dockerfile b/mongo_4-focal/Dockerfile
deleted file mode 100644
index f3a5644..0000000
diff --git a/mongo_4-nanoserver-ltsc2022/Dockerfile b/mongo_4-nanoserver-ltsc2022/Dockerfile
deleted file mode 100644
index e512dec..0000000
diff --git a/mongo_4-windowsservercore-1809/Dockerfile b/mongo_4-windowsservercore-1809/Dockerfile
deleted file mode 100644
index 2dfb595..0000000
diff --git a/mongo_4-windowsservercore-ltsc2022/Dockerfile b/mongo_4-windowsservercore-ltsc2022/Dockerfile
deleted file mode 100644
index e622560..0000000
diff --git a/mongo_7.0-rc-jammy/Dockerfile b/mongo_8.0-rc-jammy/Dockerfile
similarity index 88%
copy from mongo_7.0-rc-jammy/Dockerfile
copy to mongo_8.0-rc-jammy/Dockerfile
index 2bc42b4..3e98e13 100644
--- a/mongo_7.0-rc-jammy/Dockerfile
+++ b/mongo_8.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'; \
+ 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'; \
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' 'E58830201F7DD82CD808AA84160D26BB1785BA38' '4B0752C1BCA238C0B4EE14DC41DE058A4E7DCA05' > /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"
-# 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"
+# 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"
-# https://docs.mongodb.org/master/release-notes/7.0/
-ENV MONGO_VERSION 7.0.10~rc0
-# 05/01/2024, https://github.com/mongodb/mongo/tree/40ecdae4c3f6a19abc2bdaf48b9040a83261e54d
+# https://docs.mongodb.org/master/release-notes/8.0/
+ENV MONGO_VERSION 8.0.0~rc4
+# 04/30/2024, https://github.com/mongodb/mongo/tree/afbb110c5dbea6ec8c775acbecaadb975cffd4d6
RUN set -x \
# installing "mongodb-enterprise" pulls in "tzdata" which prompts for input
diff --git a/mongo_4-focal/docker-entrypoint.sh b/mongo_8.0-rc-jammy/docker-entrypoint.sh
similarity index 100%
rename from mongo_4-focal/docker-entrypoint.sh
rename to mongo_8.0-rc-jammy/docker-entrypoint.sh
diff --git a/mongo_4-nanoserver-1809/Dockerfile b/mongo_8.0-rc-nanoserver-1809/Dockerfile
similarity index 66%
rename from mongo_4-nanoserver-1809/Dockerfile
rename to mongo_8.0-rc-nanoserver-1809/Dockerfile
index 624e95d..530c324 100644
--- a/mongo_4-nanoserver-1809/Dockerfile
+++ b/mongo_8.0-rc-nanoserver-1809/Dockerfile
@@ -14,18 +14,18 @@ RUN setx /m PATH "C:\mongodb\bin;%PATH%"
USER ContainerUser
# doing this first to share cache across versions more aggressively
-COPY --from=mongo:4.4.29-windowsservercore-1809 \
+COPY --from=mongo:8.0.0-rc4-windowsservercore-1809 \
C:\\Windows\\System32\\msvcp140.dll \
C:\\Windows\\System32\\vcruntime140.dll \
C:\\Windows\\System32\\vcruntime140_1.dll \
C:\\Windows\\System32\\
-# https://docs.mongodb.org/master/release-notes/4.4/
-ENV MONGO_VERSION 4.4.29
-# 02/21/2024, https://github.com/mongodb/mongo/tree/f4dda329a99811c707eb06d05ad023599f9be263
+# https://docs.mongodb.org/master/release-notes/8.0/
+ENV MONGO_VERSION 8.0.0-rc4
+# 04/30/2024, https://github.com/mongodb/mongo/tree/afbb110c5dbea6ec8c775acbecaadb975cffd4d6
-COPY --from=mongo:4.4.29-windowsservercore-1809 C:\\mongodb C:\\mongodb
-RUN mongo --version && mongod --version
+COPY --from=mongo:8.0.0-rc4-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_8.0-rc-nanoserver-ltsc2022/Dockerfile
similarity index 69%
copy from mongo_6-nanoserver-ltsc2022/Dockerfile
copy to mongo_8.0-rc-nanoserver-ltsc2022/Dockerfile
index 6a9a7a4..4ceee92 100644
--- a/mongo_6-nanoserver-ltsc2022/Dockerfile
+++ b/mongo_8.0-rc-nanoserver-ltsc2022/Dockerfile
@@ -14,17 +14,17 @@ 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.15-windowsservercore-ltsc2022 \
+COPY --from=mongo:8.0.0-rc4-windowsservercore-ltsc2022 \
C:\\Windows\\System32\\msvcp140.dll \
C:\\Windows\\System32\\vcruntime140.dll \
C:\\Windows\\System32\\vcruntime140_1.dll \
C:\\Windows\\System32\\
-# https://docs.mongodb.org/master/release-notes/6.0/
-ENV MONGO_VERSION 6.0.15
-# 04/15/2024, https://github.com/mongodb/mongo/tree/7494119c41ca4e13b493e9f048df4032164e860e
+# https://docs.mongodb.org/master/release-notes/8.0/
+ENV MONGO_VERSION 8.0.0-rc4
+# 04/30/2024, https://github.com/mongodb/mongo/tree/afbb110c5dbea6ec8c775acbecaadb975cffd4d6
-COPY --from=mongo:6.0.15-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
+COPY --from=mongo:8.0.0-rc4-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_8.0-rc-windowsservercore-1809/Dockerfile
similarity index 87%
copy from mongo_6-windowsservercore-1809/Dockerfile
copy to mongo_8.0-rc-windowsservercore-1809/Dockerfile
index e510b57..3498a48 100644
--- a/mongo_6-windowsservercore-1809/Dockerfile
+++ b/mongo_8.0-rc-windowsservercore-1809/Dockerfile
@@ -8,12 +8,12 @@ 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.15
-# 04/15/2024, https://github.com/mongodb/mongo/tree/7494119c41ca4e13b493e9f048df4032164e860e
+# https://docs.mongodb.org/master/release-notes/8.0/
+ENV MONGO_VERSION 8.0.0-rc4
+# 04/30/2024, https://github.com/mongodb/mongo/tree/afbb110c5dbea6ec8c775acbecaadb975cffd4d6
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-6.0.15-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=a59408edea70438c1c9793ecdbc8b2111e44f10dd90f1ed0d2cc8071ae1cc95f
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-8.0.0-rc4-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=27e4d4a3912e2639a5bc56a4bc2417eb7d32e23c2be785cdc3f767585d884d11
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 87%
copy from mongo_windowsservercore-ltsc2022/Dockerfile
copy to mongo_8.0-rc-windowsservercore-ltsc2022/Dockerfile
index 4a38a4f..68288ad 100644
--- a/mongo_windowsservercore-ltsc2022/Dockerfile
+++ b/mongo_8.0-rc-windowsservercore-ltsc2022/Dockerfile
@@ -8,12 +8,12 @@ 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.9
-# 04/24/2024, https://github.com/mongodb/mongo/tree/3ff3a3925c36ed277cf5eafca5495f2e3728dd67
+# https://docs.mongodb.org/master/release-notes/8.0/
+ENV MONGO_VERSION 8.0.0-rc4
+# 04/30/2024, https://github.com/mongodb/mongo/tree/afbb110c5dbea6ec8c775acbecaadb975cffd4d6
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-7.0.9-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=16be51285ed6042c39a8692b5cfed3413f53b37111f54861a72857af6e5cfa90
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-8.0.0-rc4-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=27e4d4a3912e2639a5bc56a4bc2417eb7d32e23c2be785cdc3f767585d884d11
RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \Relevant Maintainers: |
yosifkit
approved these changes
May 15, 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: