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

Merged
merged 1 commit into from
Aug 4, 2022
Merged

Update mongo #12907

merged 1 commit into from
Aug 4, 2022

Conversation

tianon
Copy link
Member

@tianon tianon commented Aug 4, 2022

Changes:

Changes:

- docker-library/mongo@dd60266: Update 4.2-rc to 4.2.22-rc0
@github-actions
Copy link

github-actions bot commented Aug 4, 2022

Diff for 627d5c5:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 29f6ae8..a2a9b9a 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -69,6 +69,40 @@ GitCommit: 532d38e4ce042177caa7049efdabf8dc1a60697a
 Directory: 4.2/windows/windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
 
+Tags: 4.2.22-rc0-bionic, 4.2-rc-bionic
+SharedTags: 4.2.22-rc0, 4.2-rc
+Architectures: amd64, arm64v8
+GitCommit: dd60266188881eb79644043aab39b661feead7bc
+Directory: 4.2-rc
+
+Tags: 4.2.22-rc0-nanoserver-1809, 4.2-rc-nanoserver-1809
+SharedTags: 4.2.22-rc0-nanoserver, 4.2-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: dd60266188881eb79644043aab39b661feead7bc
+Directory: 4.2-rc/windows/nanoserver-1809
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 4.2.22-rc0-nanoserver-ltsc2022, 4.2-rc-nanoserver-ltsc2022
+SharedTags: 4.2.22-rc0-nanoserver, 4.2-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: dd60266188881eb79644043aab39b661feead7bc
+Directory: 4.2-rc/windows/nanoserver-ltsc2022
+Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
+
+Tags: 4.2.22-rc0-windowsservercore-1809, 4.2-rc-windowsservercore-1809
+SharedTags: 4.2.22-rc0-windowsservercore, 4.2-rc-windowsservercore, 4.2.22-rc0, 4.2-rc
+Architectures: windows-amd64
+GitCommit: dd60266188881eb79644043aab39b661feead7bc
+Directory: 4.2-rc/windows/windowsservercore-1809
+Constraints: windowsservercore-1809
+
+Tags: 4.2.22-rc0-windowsservercore-ltsc2022, 4.2-rc-windowsservercore-ltsc2022
+SharedTags: 4.2.22-rc0-windowsservercore, 4.2-rc-windowsservercore, 4.2.22-rc0, 4.2-rc
+Architectures: windows-amd64
+GitCommit: dd60266188881eb79644043aab39b661feead7bc
+Directory: 4.2-rc/windows/windowsservercore-ltsc2022
+Constraints: windowsservercore-ltsc2022
+
 Tags: 4.4.15-focal, 4.4-focal, 4-focal
 SharedTags: 4.4.15, 4.4, 4
 Architectures: amd64, arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index 51a81a5..650a267 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -27,6 +27,14 @@ mongo:4.2-bionic
 mongo:4.2-nanoserver
 mongo:4.2-nanoserver-1809
 mongo:4.2-nanoserver-ltsc2022
+mongo:4.2-rc
+mongo:4.2-rc-bionic
+mongo:4.2-rc-nanoserver
+mongo:4.2-rc-nanoserver-1809
+mongo:4.2-rc-nanoserver-ltsc2022
+mongo:4.2-rc-windowsservercore
+mongo:4.2-rc-windowsservercore-1809
+mongo:4.2-rc-windowsservercore-ltsc2022
 mongo:4.2-windowsservercore
 mongo:4.2-windowsservercore-1809
 mongo:4.2-windowsservercore-ltsc2022
@@ -38,6 +46,14 @@ mongo:4.2.21-nanoserver-ltsc2022
 mongo:4.2.21-windowsservercore
 mongo:4.2.21-windowsservercore-1809
 mongo:4.2.21-windowsservercore-ltsc2022
+mongo:4.2.22-rc0
+mongo:4.2.22-rc0-bionic
+mongo:4.2.22-rc0-nanoserver
+mongo:4.2.22-rc0-nanoserver-1809
+mongo:4.2.22-rc0-nanoserver-ltsc2022
+mongo:4.2.22-rc0-windowsservercore
+mongo:4.2.22-rc0-windowsservercore-1809
+mongo:4.2.22-rc0-windowsservercore-ltsc2022
 mongo:4.4
 mongo:4.4-focal
 mongo:4.4-nanoserver
diff --git a/mongo_4.2-bionic/Dockerfile b/mongo_4.2-rc-bionic/Dockerfile
similarity index 92%
copy from mongo_4.2-bionic/Dockerfile
copy to mongo_4.2-rc-bionic/Dockerfile
index 9d6bc34..2d55a68 100644
--- a/mongo_4.2-bionic/Dockerfile
+++ b/mongo_4.2-rc-bionic/Dockerfile
@@ -71,7 +71,7 @@ RUN mkdir /docker-entrypoint-initdb.d
 
 RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
-	set -- 'E162F504A20CDF15827F718D4B7C549A058F8B6B'; \
+	set -- '20691EEC35216C63CAF66CE1656408E390CFB1F5' '39BD841E4BE5FB195A65400E6A26B1AE64C3C388' '9DA31620334BD75D9DCB49F368818C72E52529D4' 'E162F504A20CDF15827F718D4B7C549A058F8B6B' 'F5679A222C647C87527C2F8CB00A0BD1E2C63C11'; \
 	for key; do \
 		gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
 	done; \
@@ -88,12 +88,12 @@ ARG MONGO_PACKAGE=mongodb-org
 ARG MONGO_REPO=repo.mongodb.org
 ENV MONGO_PACKAGE=${MONGO_PACKAGE} MONGO_REPO=${MONGO_REPO}
 
-ENV MONGO_MAJOR 4.2
+ENV MONGO_MAJOR testing
 RUN echo "deb [ signed-by=/etc/apt/keyrings/mongodb.gpg ] http://$MONGO_REPO/apt/ubuntu bionic/${MONGO_PACKAGE%-unstable}/$MONGO_MAJOR multiverse" | tee "/etc/apt/sources.list.d/${MONGO_PACKAGE%-unstable}.list"
 
 # https://docs.mongodb.org/master/release-notes/4.2/
-ENV MONGO_VERSION 4.2.21
-# 06/15/2022, https://github.com/mongodb/mongo/tree/b0aeed9445ff41af07449fa757e1f231bce990b3
+ENV MONGO_VERSION 4.2.22~rc0
+# 07/27/2022, https://github.com/mongodb/mongo/tree/eef44cd56b1cc11e5771736fa6cb3077e0228be2
 
 RUN set -x \
 # installing "mongodb-enterprise" pulls in "tzdata" which prompts for input
diff --git a/mongo_4-focal/docker-entrypoint.sh b/mongo_4.2-rc-bionic/docker-entrypoint.sh
similarity index 100%
copy from mongo_4-focal/docker-entrypoint.sh
copy to mongo_4.2-rc-bionic/docker-entrypoint.sh
diff --git a/mongo_4.2-nanoserver-1809/Dockerfile b/mongo_4.2-rc-nanoserver-1809/Dockerfile
similarity index 73%
copy from mongo_4.2-nanoserver-1809/Dockerfile
copy to mongo_4.2-rc-nanoserver-1809/Dockerfile
index 698bb1b..249d157 100644
--- a/mongo_4.2-nanoserver-1809/Dockerfile
+++ b/mongo_4.2-rc-nanoserver-1809/Dockerfile
@@ -14,16 +14,16 @@ RUN setx /m PATH "C:\mongodb\bin;%PATH%"
 USER ContainerUser
 # doing this first to share cache across versions more aggressively
 
-COPY --from=mongo:4.2.21-windowsservercore-1809 \
+COPY --from=mongo:4.2.22-rc0-windowsservercore-1809 \
 	C:\\Windows\\System32\\msvcp140.dll \
 	C:\\Windows\\System32\\vcruntime140.dll \
 	C:\\Windows\\System32\\
 
 # https://docs.mongodb.org/master/release-notes/4.2/
-ENV MONGO_VERSION 4.2.21
-# 06/15/2022, https://github.com/mongodb/mongo/tree/b0aeed9445ff41af07449fa757e1f231bce990b3
+ENV MONGO_VERSION 4.2.22-rc0
+# 07/27/2022, https://github.com/mongodb/mongo/tree/eef44cd56b1cc11e5771736fa6cb3077e0228be2
 
-COPY --from=mongo:4.2.21-windowsservercore-1809 C:\\mongodb C:\\mongodb
+COPY --from=mongo:4.2.22-rc0-windowsservercore-1809 C:\\mongodb C:\\mongodb
 RUN mongo --version && mongod --version
 
 VOLUME C:\\data\\db C:\\data\\configdb
diff --git a/mongo_4.2-nanoserver-ltsc2022/Dockerfile b/mongo_4.2-rc-nanoserver-ltsc2022/Dockerfile
similarity index 73%
copy from mongo_4.2-nanoserver-ltsc2022/Dockerfile
copy to mongo_4.2-rc-nanoserver-ltsc2022/Dockerfile
index adb0ca9..c899824 100644
--- a/mongo_4.2-nanoserver-ltsc2022/Dockerfile
+++ b/mongo_4.2-rc-nanoserver-ltsc2022/Dockerfile
@@ -14,16 +14,16 @@ RUN setx /m PATH "C:\mongodb\bin;%PATH%"
 USER ContainerUser
 # doing this first to share cache across versions more aggressively
 
-COPY --from=mongo:4.2.21-windowsservercore-ltsc2022 \
+COPY --from=mongo:4.2.22-rc0-windowsservercore-ltsc2022 \
 	C:\\Windows\\System32\\msvcp140.dll \
 	C:\\Windows\\System32\\vcruntime140.dll \
 	C:\\Windows\\System32\\
 
 # https://docs.mongodb.org/master/release-notes/4.2/
-ENV MONGO_VERSION 4.2.21
-# 06/15/2022, https://github.com/mongodb/mongo/tree/b0aeed9445ff41af07449fa757e1f231bce990b3
+ENV MONGO_VERSION 4.2.22-rc0
+# 07/27/2022, https://github.com/mongodb/mongo/tree/eef44cd56b1cc11e5771736fa6cb3077e0228be2
 
-COPY --from=mongo:4.2.21-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
+COPY --from=mongo:4.2.22-rc0-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
 RUN mongo --version && mongod --version
 
 VOLUME C:\\data\\db C:\\data\\configdb
diff --git a/mongo_4.2-windowsservercore-1809/Dockerfile b/mongo_4.2-rc-windowsservercore-1809/Dockerfile
similarity index 89%
copy from mongo_4.2-windowsservercore-1809/Dockerfile
copy to mongo_4.2-rc-windowsservercore-1809/Dockerfile
index b1f724b..0ca8deb 100644
--- a/mongo_4.2-windowsservercore-1809/Dockerfile
+++ b/mongo_4.2-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/4.2/
-ENV MONGO_VERSION 4.2.21
-# 06/15/2022, https://github.com/mongodb/mongo/tree/b0aeed9445ff41af07449fa757e1f231bce990b3
+ENV MONGO_VERSION 4.2.22-rc0
+# 07/27/2022, https://github.com/mongodb/mongo/tree/eef44cd56b1cc11e5771736fa6cb3077e0228be2
 
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2012plus-4.2.21-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=2d520d39336e1918c6062d9d48626be78336447c23aeff38d1db66a4a89c9963
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2012plus-4.2.22-rc0-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=a2cf68740de7dc9625d5aa364b699c9bd34be00388196b3299d4776869791a31
 
 RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
diff --git a/mongo_4.2-windowsservercore-ltsc2022/Dockerfile b/mongo_4.2-rc-windowsservercore-ltsc2022/Dockerfile
similarity index 89%
copy from mongo_4.2-windowsservercore-ltsc2022/Dockerfile
copy to mongo_4.2-rc-windowsservercore-ltsc2022/Dockerfile
index a3632b2..2891ba3 100644
--- a/mongo_4.2-windowsservercore-ltsc2022/Dockerfile
+++ b/mongo_4.2-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/4.2/
-ENV MONGO_VERSION 4.2.21
-# 06/15/2022, https://github.com/mongodb/mongo/tree/b0aeed9445ff41af07449fa757e1f231bce990b3
+ENV MONGO_VERSION 4.2.22-rc0
+# 07/27/2022, https://github.com/mongodb/mongo/tree/eef44cd56b1cc11e5771736fa6cb3077e0228be2
 
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2012plus-4.2.21-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=2d520d39336e1918c6062d9d48626be78336447c23aeff38d1db66a4a89c9963
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2012plus-4.2.22-rc0-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=a2cf68740de7dc9625d5aa364b699c9bd34be00388196b3299d4776869791a31
 
 RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \

Relevant Maintainers:

@yosifkit yosifkit merged commit 08d8c48 into docker-library:master Aug 4, 2022
@yosifkit yosifkit deleted the mongo branch August 4, 2022 18:58
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.

3 participants