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 #15301

Merged
merged 1 commit into from
Sep 1, 2023
Merged

Update mongo #15301

merged 1 commit into from
Sep 1, 2023

Conversation

yosifkit
Copy link
Member

@yosifkit yosifkit commented Sep 1, 2023

Changes:

Changes:

- docker-library/mongo@959b0a1: Update 5.0-rc to 5.0.21-rc0
@github-actions
Copy link

github-actions bot commented Sep 1, 2023

Diff for 44f6539:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index cff7a78..b4e783d 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -69,6 +69,40 @@ GitCommit: e8ea57e9603c08043bf9d26d52567fead3eacb91
 Directory: 5.0/windows/windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
 
+Tags: 5.0.21-rc0-focal, 5.0-rc-focal
+SharedTags: 5.0.21-rc0, 5.0-rc
+Architectures: amd64, arm64v8
+GitCommit: 959b0a109d63ee9784621e21e4fdf075f972bd99
+Directory: 5.0-rc
+
+Tags: 5.0.21-rc0-nanoserver-1809, 5.0-rc-nanoserver-1809
+SharedTags: 5.0.21-rc0-nanoserver, 5.0-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: 959b0a109d63ee9784621e21e4fdf075f972bd99
+Directory: 5.0-rc/windows/nanoserver-1809
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 5.0.21-rc0-nanoserver-ltsc2022, 5.0-rc-nanoserver-ltsc2022
+SharedTags: 5.0.21-rc0-nanoserver, 5.0-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: 959b0a109d63ee9784621e21e4fdf075f972bd99
+Directory: 5.0-rc/windows/nanoserver-ltsc2022
+Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
+
+Tags: 5.0.21-rc0-windowsservercore-1809, 5.0-rc-windowsservercore-1809
+SharedTags: 5.0.21-rc0-windowsservercore, 5.0-rc-windowsservercore, 5.0.21-rc0, 5.0-rc
+Architectures: windows-amd64
+GitCommit: 959b0a109d63ee9784621e21e4fdf075f972bd99
+Directory: 5.0-rc/windows/windowsservercore-1809
+Constraints: windowsservercore-1809
+
+Tags: 5.0.21-rc0-windowsservercore-ltsc2022, 5.0-rc-windowsservercore-ltsc2022
+SharedTags: 5.0.21-rc0-windowsservercore, 5.0-rc-windowsservercore, 5.0.21-rc0, 5.0-rc
+Architectures: windows-amd64
+GitCommit: 959b0a109d63ee9784621e21e4fdf075f972bd99
+Directory: 5.0-rc/windows/windowsservercore-ltsc2022
+Constraints: windowsservercore-ltsc2022
+
 Tags: 6.0.9-jammy, 6.0-jammy, 6-jammy
 SharedTags: 6.0.9, 6.0, 6
 Architectures: amd64, arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index dbf6d3b..09e34a9 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -35,6 +35,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
@@ -46,6 +54,14 @@ mongo:5.0.20-nanoserver-ltsc2022
 mongo:5.0.20-windowsservercore
 mongo:5.0.20-windowsservercore-1809
 mongo:5.0.20-windowsservercore-ltsc2022
+mongo:5.0.21-rc0
+mongo:5.0.21-rc0-focal
+mongo:5.0.21-rc0-nanoserver
+mongo:5.0.21-rc0-nanoserver-1809
+mongo:5.0.21-rc0-nanoserver-ltsc2022
+mongo:5.0.21-rc0-windowsservercore
+mongo:5.0.21-rc0-windowsservercore-1809
+mongo:5.0.21-rc0-windowsservercore-ltsc2022
 mongo:6
 mongo:6-jammy
 mongo:6-nanoserver
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 35972c4..f48d3d0 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -4,6 +4,9 @@ mongo:4-windowsservercore-ltsc2022
 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
@@ -17,6 +20,8 @@ mongo:4-nanoserver-1809
 mongo:4-nanoserver-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:nanoserver-1809
diff --git a/mongo_7.0-rc-jammy/Dockerfile b/mongo_5.0-rc-focal/Dockerfile
similarity index 89%
copy from mongo_7.0-rc-jammy/Dockerfile
copy to mongo_5.0-rc-focal/Dockerfile
index a5194d4..2435db7 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; \
@@ -81,13 +81,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.gpg ] 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.gpg ] 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.gpg ] 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.gpg ] 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.1~rc0
-# 08/22/2023, https://github.com/mongodb/mongo/tree/425a0454d12f2664f9e31002bbe4a386a25345b5
+# https://docs.mongodb.org/master/release-notes/5.0/
+ENV MONGO_VERSION 5.0.21~rc0
+# 08/30/2023, https://github.com/mongodb/mongo/tree/4fad44a858d8ee2d642566fc8872ef410f6534e4
 
 RUN set -x \
 # installing "mongodb-enterprise" pulls in "tzdata" which prompts for input
@@ -99,8 +99,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_4-focal/docker-entrypoint.sh b/mongo_5.0-rc-focal/docker-entrypoint.sh
similarity index 100%
copy from mongo_4-focal/docker-entrypoint.sh
copy to mongo_5.0-rc-focal/docker-entrypoint.sh
diff --git a/mongo_5-nanoserver-1809/Dockerfile b/mongo_5.0-rc-nanoserver-1809/Dockerfile
similarity index 75%
copy from mongo_5-nanoserver-1809/Dockerfile
copy to mongo_5.0-rc-nanoserver-1809/Dockerfile
index 08a6a99..3d43b46 100644
--- a/mongo_5-nanoserver-1809/Dockerfile
+++ b/mongo_5.0-rc-nanoserver-1809/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:5.0.20-windowsservercore-1809 \
+COPY --from=mongo:5.0.21-rc0-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/5.0/
-ENV MONGO_VERSION 5.0.20
-# 08/09/2023, https://github.com/mongodb/mongo/tree/2cd626d8148120319d7dca5824e760fe220cb0de
+ENV MONGO_VERSION 5.0.21-rc0
+# 08/30/2023, https://github.com/mongodb/mongo/tree/4fad44a858d8ee2d642566fc8872ef410f6534e4
 
-COPY --from=mongo:5.0.20-windowsservercore-1809 C:\\mongodb C:\\mongodb
+COPY --from=mongo:5.0.21-rc0-windowsservercore-1809 C:\\mongodb C:\\mongodb
 RUN mongo --version && mongod --version
 
 VOLUME C:\\data\\db C:\\data\\configdb
diff --git a/mongo_5-nanoserver-ltsc2022/Dockerfile b/mongo_5.0-rc-nanoserver-ltsc2022/Dockerfile
similarity index 74%
copy from mongo_5-nanoserver-ltsc2022/Dockerfile
copy to mongo_5.0-rc-nanoserver-ltsc2022/Dockerfile
index 432a34e..b70db3a 100644
--- a/mongo_5-nanoserver-ltsc2022/Dockerfile
+++ b/mongo_5.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:5.0.20-windowsservercore-ltsc2022 \
+COPY --from=mongo:5.0.21-rc0-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/5.0/
-ENV MONGO_VERSION 5.0.20
-# 08/09/2023, https://github.com/mongodb/mongo/tree/2cd626d8148120319d7dca5824e760fe220cb0de
+ENV MONGO_VERSION 5.0.21-rc0
+# 08/30/2023, https://github.com/mongodb/mongo/tree/4fad44a858d8ee2d642566fc8872ef410f6534e4
 
-COPY --from=mongo:5.0.20-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
+COPY --from=mongo:5.0.21-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 b1513a3..86b366b 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.20
-# 08/09/2023, https://github.com/mongodb/mongo/tree/2cd626d8148120319d7dca5824e760fe220cb0de
+ENV MONGO_VERSION 5.0.21-rc0
+# 08/30/2023, https://github.com/mongodb/mongo/tree/4fad44a858d8ee2d642566fc8872ef410f6534e4
 
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-5.0.20-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=0d4aab3972b834d3d75a7c0348c4d788418b485633615cebc96d876c4c48c43b
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-5.0.21-rc0-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=efab08f548170a216cfa6b4dde02683c0cd10a71890597c662cf7e3a18ec6fcf
 
 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 d6a1c5a..3f3da7b 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.20
-# 08/09/2023, https://github.com/mongodb/mongo/tree/2cd626d8148120319d7dca5824e760fe220cb0de
+ENV MONGO_VERSION 5.0.21-rc0
+# 08/30/2023, https://github.com/mongodb/mongo/tree/4fad44a858d8ee2d642566fc8872ef410f6534e4
 
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-5.0.20-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=0d4aab3972b834d3d75a7c0348c4d788418b485633615cebc96d876c4c48c43b
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-5.0.21-rc0-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=efab08f548170a216cfa6b4dde02683c0cd10a71890597c662cf7e3a18ec6fcf
 
 RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \

Relevant Maintainers:

@yosifkit yosifkit merged commit 4af3492 into docker-library:master Sep 1, 2023
@yosifkit yosifkit deleted the mongo branch September 1, 2023 22:24
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.

2 participants