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

Merged
merged 1 commit into from
Mar 1, 2022
Merged

Update mongo #11943

merged 1 commit into from
Mar 1, 2022

Conversation

tianon
Copy link
Member

@tianon tianon commented Feb 28, 2022

Changes:

Changes:

- docker-library/mongo@2b2185c: Update 4.4-rc to 4.4.13-rc0
- docker-library/mongo@315b2e4: Update 4.2-rc to 4.2.19-rc0
- docker-library/mongo@ed5764f: Merge pull request docker-library/mongo#520 from infosiftr/signed-by
- docker-library/mongo@a5085fb: Switch from apt-key/trusted.gpg(.d) to signed-by
@github-actions
Copy link

Diff for fdd4c88:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 24cd990..540aa66 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -32,13 +32,13 @@ Constraints: windowsservercore-ltsc2022
 Tags: 4.0.28-xenial, 4.0-xenial
 SharedTags: 4.0.28, 4.0
 Architectures: amd64, arm64v8
-GitCommit: 49067a7b2f09935df5f6e7d39072f3bfdf38c229
+GitCommit: a5085fbda43201055b88e92613bce6d05d18f77b
 Directory: 4.0
 
 Tags: 4.2.18-bionic, 4.2-bionic
 SharedTags: 4.2.18, 4.2
 Architectures: amd64, arm64v8
-GitCommit: 5a9d31003ba249f6e0dc5a3536a904f408d538a4
+GitCommit: a5085fbda43201055b88e92613bce6d05d18f77b
 Directory: 4.2
 
 Tags: 4.2.18-nanoserver-1809, 4.2-nanoserver-1809
@@ -69,10 +69,44 @@ GitCommit: 5a9d31003ba249f6e0dc5a3536a904f408d538a4
 Directory: 4.2/windows/windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
 
+Tags: 4.2.19-rc0-bionic, 4.2-rc-bionic
+SharedTags: 4.2.19-rc0, 4.2-rc
+Architectures: amd64, arm64v8
+GitCommit: 315b2e47435dceeb47e4975ecae530e3b667951c
+Directory: 4.2-rc
+
+Tags: 4.2.19-rc0-nanoserver-1809, 4.2-rc-nanoserver-1809
+SharedTags: 4.2.19-rc0-nanoserver, 4.2-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: 315b2e47435dceeb47e4975ecae530e3b667951c
+Directory: 4.2-rc/windows/nanoserver-1809
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 4.2.19-rc0-nanoserver-ltsc2022, 4.2-rc-nanoserver-ltsc2022
+SharedTags: 4.2.19-rc0-nanoserver, 4.2-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: 315b2e47435dceeb47e4975ecae530e3b667951c
+Directory: 4.2-rc/windows/nanoserver-ltsc2022
+Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
+
+Tags: 4.2.19-rc0-windowsservercore-1809, 4.2-rc-windowsservercore-1809
+SharedTags: 4.2.19-rc0-windowsservercore, 4.2-rc-windowsservercore, 4.2.19-rc0, 4.2-rc
+Architectures: windows-amd64
+GitCommit: 315b2e47435dceeb47e4975ecae530e3b667951c
+Directory: 4.2-rc/windows/windowsservercore-1809
+Constraints: windowsservercore-1809
+
+Tags: 4.2.19-rc0-windowsservercore-ltsc2022, 4.2-rc-windowsservercore-ltsc2022
+SharedTags: 4.2.19-rc0-windowsservercore, 4.2-rc-windowsservercore, 4.2.19-rc0, 4.2-rc
+Architectures: windows-amd64
+GitCommit: 315b2e47435dceeb47e4975ecae530e3b667951c
+Directory: 4.2-rc/windows/windowsservercore-ltsc2022
+Constraints: windowsservercore-ltsc2022
+
 Tags: 4.4.12-focal, 4.4-focal, 4-focal
 SharedTags: 4.4.12, 4.4, 4
 Architectures: amd64, arm64v8
-GitCommit: 80a9f191683e6a7324b6a4c300ea2216f01c581b
+GitCommit: a5085fbda43201055b88e92613bce6d05d18f77b
 Directory: 4.4
 
 Tags: 4.4.12-nanoserver-1809, 4.4-nanoserver-1809, 4-nanoserver-1809
@@ -103,10 +137,44 @@ GitCommit: 80a9f191683e6a7324b6a4c300ea2216f01c581b
 Directory: 4.4/windows/windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
 
+Tags: 4.4.13-rc0-focal, 4.4-rc-focal
+SharedTags: 4.4.13-rc0, 4.4-rc
+Architectures: amd64, arm64v8
+GitCommit: 2b2185c518004397bc3d823915bce95fe9c7954b
+Directory: 4.4-rc
+
+Tags: 4.4.13-rc0-nanoserver-1809, 4.4-rc-nanoserver-1809
+SharedTags: 4.4.13-rc0-nanoserver, 4.4-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: 2b2185c518004397bc3d823915bce95fe9c7954b
+Directory: 4.4-rc/windows/nanoserver-1809
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 4.4.13-rc0-nanoserver-ltsc2022, 4.4-rc-nanoserver-ltsc2022
+SharedTags: 4.4.13-rc0-nanoserver, 4.4-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: 2b2185c518004397bc3d823915bce95fe9c7954b
+Directory: 4.4-rc/windows/nanoserver-ltsc2022
+Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
+
+Tags: 4.4.13-rc0-windowsservercore-1809, 4.4-rc-windowsservercore-1809
+SharedTags: 4.4.13-rc0-windowsservercore, 4.4-rc-windowsservercore, 4.4.13-rc0, 4.4-rc
+Architectures: windows-amd64
+GitCommit: 2b2185c518004397bc3d823915bce95fe9c7954b
+Directory: 4.4-rc/windows/windowsservercore-1809
+Constraints: windowsservercore-1809
+
+Tags: 4.4.13-rc0-windowsservercore-ltsc2022, 4.4-rc-windowsservercore-ltsc2022
+SharedTags: 4.4.13-rc0-windowsservercore, 4.4-rc-windowsservercore, 4.4.13-rc0, 4.4-rc
+Architectures: windows-amd64
+GitCommit: 2b2185c518004397bc3d823915bce95fe9c7954b
+Directory: 4.4-rc/windows/windowsservercore-ltsc2022
+Constraints: windowsservercore-ltsc2022
+
 Tags: 5.0.6-focal, 5.0-focal, 5-focal, focal
 SharedTags: 5.0.6, 5.0, 5, latest
 Architectures: amd64, arm64v8
-GitCommit: afaa3e893e677f99988f11b18e7f681ef90a5534
+GitCommit: a5085fbda43201055b88e92613bce6d05d18f77b
 Directory: 5.0
 
 Tags: 5.0.6-nanoserver-1809, 5.0-nanoserver-1809, 5-nanoserver-1809, nanoserver-1809
diff --git a/_bashbrew-list b/_bashbrew-list
index c1e3830..c9e1d1c 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,11 +46,27 @@ mongo:4.2.18-nanoserver-ltsc2022
 mongo:4.2.18-windowsservercore
 mongo:4.2.18-windowsservercore-1809
 mongo:4.2.18-windowsservercore-ltsc2022
+mongo:4.2.19-rc0
+mongo:4.2.19-rc0-bionic
+mongo:4.2.19-rc0-nanoserver
+mongo:4.2.19-rc0-nanoserver-1809
+mongo:4.2.19-rc0-nanoserver-ltsc2022
+mongo:4.2.19-rc0-windowsservercore
+mongo:4.2.19-rc0-windowsservercore-1809
+mongo:4.2.19-rc0-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-rc
+mongo:4.4-rc-focal
+mongo:4.4-rc-nanoserver
+mongo:4.4-rc-nanoserver-1809
+mongo:4.4-rc-nanoserver-ltsc2022
+mongo:4.4-rc-windowsservercore
+mongo:4.4-rc-windowsservercore-1809
+mongo:4.4-rc-windowsservercore-ltsc2022
 mongo:4.4-windowsservercore
 mongo:4.4-windowsservercore-1809
 mongo:4.4-windowsservercore-ltsc2022
@@ -54,6 +78,14 @@ mongo:4.4.12-nanoserver-ltsc2022
 mongo:4.4.12-windowsservercore
 mongo:4.4.12-windowsservercore-1809
 mongo:4.4.12-windowsservercore-ltsc2022
+mongo:4.4.13-rc0
+mongo:4.4.13-rc0-focal
+mongo:4.4.13-rc0-nanoserver
+mongo:4.4.13-rc0-nanoserver-1809
+mongo:4.4.13-rc0-nanoserver-ltsc2022
+mongo:4.4.13-rc0-windowsservercore
+mongo:4.4.13-rc0-windowsservercore-1809
+mongo:4.4.13-rc0-windowsservercore-ltsc2022
 mongo:5
 mongo:5-focal
 mongo:5-nanoserver
diff --git a/mongo_4-focal/Dockerfile b/mongo_4-focal/Dockerfile
index d950caf..e9d21ca 100644
--- a/mongo_4-focal/Dockerfile
+++ b/mongo_4-focal/Dockerfile
@@ -71,10 +71,10 @@ RUN set -ex; \
 	for key; do \
 		gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
 	done; \
-	gpg --batch --export "$@" > /etc/apt/trusted.gpg.d/mongodb.gpg; \
+	mkdir -p /etc/apt/keyrings; \
+	gpg --batch --export "$@" > /etc/apt/keyrings/mongodb.gpg; \
 	command -v gpgconf && gpgconf --kill all || :; \
-	rm -r "$GNUPGHOME"; \
-	apt-key list
+	rm -r "$GNUPGHOME"
 
 # Allow build-time overrides (eg. to build image with MongoDB Enterprise version)
 # Options for MONGO_PACKAGE: mongodb-org OR mongodb-enterprise
@@ -85,7 +85,7 @@ ARG MONGO_REPO=repo.mongodb.org
 ENV MONGO_PACKAGE=${MONGO_PACKAGE} MONGO_REPO=${MONGO_REPO}
 
 ENV MONGO_MAJOR 4.4
-RUN echo "deb http://$MONGO_REPO/apt/ubuntu focal/${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"
 
 # http://docs.mongodb.org/master/release-notes/4.4/
 ENV MONGO_VERSION 4.4.12
diff --git a/mongo_4.0-xenial/Dockerfile b/mongo_4.0-xenial/Dockerfile
index 9dc8e6c..5f36c4d 100644
--- a/mongo_4.0-xenial/Dockerfile
+++ b/mongo_4.0-xenial/Dockerfile
@@ -71,10 +71,10 @@ RUN set -ex; \
 	for key; do \
 		gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
 	done; \
-	gpg --batch --export "$@" > /etc/apt/trusted.gpg.d/mongodb.gpg; \
+	mkdir -p /etc/apt/keyrings; \
+	gpg --batch --export "$@" > /etc/apt/keyrings/mongodb.gpg; \
 	command -v gpgconf && gpgconf --kill all || :; \
-	rm -r "$GNUPGHOME"; \
-	apt-key list
+	rm -r "$GNUPGHOME"
 
 # Allow build-time overrides (eg. to build image with MongoDB Enterprise version)
 # Options for MONGO_PACKAGE: mongodb-org OR mongodb-enterprise
@@ -85,7 +85,7 @@ ARG MONGO_REPO=repo.mongodb.org
 ENV MONGO_PACKAGE=${MONGO_PACKAGE} MONGO_REPO=${MONGO_REPO}
 
 ENV MONGO_MAJOR 4.0
-RUN echo "deb http://$MONGO_REPO/apt/ubuntu xenial/${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 xenial/${MONGO_PACKAGE%-unstable}/$MONGO_MAJOR multiverse" | tee "/etc/apt/sources.list.d/${MONGO_PACKAGE%-unstable}.list"
 
 # http://docs.mongodb.org/master/release-notes/4.0/
 ENV MONGO_VERSION 4.0.28
diff --git a/mongo_4.2-bionic/Dockerfile b/mongo_4.2-bionic/Dockerfile
index 0876adb..05bce71 100644
--- a/mongo_4.2-bionic/Dockerfile
+++ b/mongo_4.2-bionic/Dockerfile
@@ -71,10 +71,10 @@ RUN set -ex; \
 	for key; do \
 		gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
 	done; \
-	gpg --batch --export "$@" > /etc/apt/trusted.gpg.d/mongodb.gpg; \
+	mkdir -p /etc/apt/keyrings; \
+	gpg --batch --export "$@" > /etc/apt/keyrings/mongodb.gpg; \
 	command -v gpgconf && gpgconf --kill all || :; \
-	rm -r "$GNUPGHOME"; \
-	apt-key list
+	rm -r "$GNUPGHOME"
 
 # Allow build-time overrides (eg. to build image with MongoDB Enterprise version)
 # Options for MONGO_PACKAGE: mongodb-org OR mongodb-enterprise
@@ -85,7 +85,7 @@ ARG MONGO_REPO=repo.mongodb.org
 ENV MONGO_PACKAGE=${MONGO_PACKAGE} MONGO_REPO=${MONGO_REPO}
 
 ENV MONGO_MAJOR 4.2
-RUN echo "deb http://$MONGO_REPO/apt/ubuntu bionic/${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 bionic/${MONGO_PACKAGE%-unstable}/$MONGO_MAJOR multiverse" | tee "/etc/apt/sources.list.d/${MONGO_PACKAGE%-unstable}.list"
 
 # http://docs.mongodb.org/master/release-notes/4.2/
 ENV MONGO_VERSION 4.2.18
diff --git a/mongo_4.2-bionic/Dockerfile b/mongo_4.2-rc-bionic/Dockerfile
similarity index 86%
copy from mongo_4.2-bionic/Dockerfile
copy to mongo_4.2-rc-bionic/Dockerfile
index 0876adb..8f226dd 100644
--- a/mongo_4.2-bionic/Dockerfile
+++ b/mongo_4.2-rc-bionic/Dockerfile
@@ -67,14 +67,14 @@ RUN mkdir /docker-entrypoint-initdb.d
 
 RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
-	set -- 'E162F504A20CDF15827F718D4B7C549A058F8B6B'; \
+	set -- '20691EEC35216C63CAF66CE1656408E390CFB1F5' '9DA31620334BD75D9DCB49F368818C72E52529D4' 'E162F504A20CDF15827F718D4B7C549A058F8B6B' 'F5679A222C647C87527C2F8CB00A0BD1E2C63C11'; \
 	for key; do \
 		gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
 	done; \
-	gpg --batch --export "$@" > /etc/apt/trusted.gpg.d/mongodb.gpg; \
+	mkdir -p /etc/apt/keyrings; \
+	gpg --batch --export "$@" > /etc/apt/keyrings/mongodb.gpg; \
 	command -v gpgconf && gpgconf --kill all || :; \
-	rm -r "$GNUPGHOME"; \
-	apt-key list
+	rm -r "$GNUPGHOME"
 
 # Allow build-time overrides (eg. to build image with MongoDB Enterprise version)
 # Options for MONGO_PACKAGE: mongodb-org OR mongodb-enterprise
@@ -84,12 +84,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
-RUN echo "deb http://$MONGO_REPO/apt/ubuntu bionic/${MONGO_PACKAGE%-unstable}/$MONGO_MAJOR multiverse" | tee "/etc/apt/sources.list.d/${MONGO_PACKAGE%-unstable}.list"
+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"
 
 # http://docs.mongodb.org/master/release-notes/4.2/
-ENV MONGO_VERSION 4.2.18
-# 01/04/2022, https://github.com/mongodb/mongo/tree/f65ce5e25c0b26a00d091a4d24eec1a8b3a4c016
+ENV MONGO_VERSION 4.2.19~rc0
+# 02/24/2022, https://github.com/mongodb/mongo/tree/e68a7d47305e14e090cba9ce3d92533053299996
 
 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 6813bdc..e1e31cb 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.18-windowsservercore-1809 \
+COPY --from=mongo:4.2.19-rc0-windowsservercore-1809 \
 	C:\\Windows\\System32\\msvcp140.dll \
 	C:\\Windows\\System32\\vcruntime140.dll \
 	C:\\Windows\\System32\\
 
 # http://docs.mongodb.org/master/release-notes/4.2/
-ENV MONGO_VERSION 4.2.18
-# 01/04/2022, https://github.com/mongodb/mongo/tree/f65ce5e25c0b26a00d091a4d24eec1a8b3a4c016
+ENV MONGO_VERSION 4.2.19-rc0
+# 02/24/2022, https://github.com/mongodb/mongo/tree/e68a7d47305e14e090cba9ce3d92533053299996
 
-COPY --from=mongo:4.2.18-windowsservercore-1809 C:\\mongodb C:\\mongodb
+COPY --from=mongo:4.2.19-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 996f8f7..415c6b7 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.18-windowsservercore-ltsc2022 \
+COPY --from=mongo:4.2.19-rc0-windowsservercore-ltsc2022 \
 	C:\\Windows\\System32\\msvcp140.dll \
 	C:\\Windows\\System32\\vcruntime140.dll \
 	C:\\Windows\\System32\\
 
 # http://docs.mongodb.org/master/release-notes/4.2/
-ENV MONGO_VERSION 4.2.18
-# 01/04/2022, https://github.com/mongodb/mongo/tree/f65ce5e25c0b26a00d091a4d24eec1a8b3a4c016
+ENV MONGO_VERSION 4.2.19-rc0
+# 02/24/2022, https://github.com/mongodb/mongo/tree/e68a7d47305e14e090cba9ce3d92533053299996
 
-COPY --from=mongo:4.2.18-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
+COPY --from=mongo:4.2.19-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 548edaa..a3bcdfe 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';"]
 
 # http://docs.mongodb.org/master/release-notes/4.2/
-ENV MONGO_VERSION 4.2.18
-# 01/04/2022, https://github.com/mongodb/mongo/tree/f65ce5e25c0b26a00d091a4d24eec1a8b3a4c016
+ENV MONGO_VERSION 4.2.19-rc0
+# 02/24/2022, https://github.com/mongodb/mongo/tree/e68a7d47305e14e090cba9ce3d92533053299996
 
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2012plus-4.2.18-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=b10879892c9729e55bd347f6084d2783e295d3bd041167e62a5d1da6538dd6ef
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2012plus-4.2.19-rc0-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=2480a5f414f5e714c9be91d82e2c0763d5a67bcce7fb7e8b3d33fbf3f1b3fdd9
 
 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 0e52a65..000af9e 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';"]
 
 # http://docs.mongodb.org/master/release-notes/4.2/
-ENV MONGO_VERSION 4.2.18
-# 01/04/2022, https://github.com/mongodb/mongo/tree/f65ce5e25c0b26a00d091a4d24eec1a8b3a4c016
+ENV MONGO_VERSION 4.2.19-rc0
+# 02/24/2022, https://github.com/mongodb/mongo/tree/e68a7d47305e14e090cba9ce3d92533053299996
 
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2012plus-4.2.18-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=b10879892c9729e55bd347f6084d2783e295d3bd041167e62a5d1da6538dd6ef
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2012plus-4.2.19-rc0-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=2480a5f414f5e714c9be91d82e2c0763d5a67bcce7fb7e8b3d33fbf3f1b3fdd9
 
 RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
diff --git a/mongo_4-focal/Dockerfile b/mongo_4.4-rc-focal/Dockerfile
similarity index 86%
copy from mongo_4-focal/Dockerfile
copy to mongo_4.4-rc-focal/Dockerfile
index d950caf..b782fda 100644
--- a/mongo_4-focal/Dockerfile
+++ b/mongo_4.4-rc-focal/Dockerfile
@@ -67,14 +67,14 @@ RUN mkdir /docker-entrypoint-initdb.d
 
 RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
-	set -- '20691EEC35216C63CAF66CE1656408E390CFB1F5'; \
+	set -- '20691EEC35216C63CAF66CE1656408E390CFB1F5' '9DA31620334BD75D9DCB49F368818C72E52529D4' 'E162F504A20CDF15827F718D4B7C549A058F8B6B' 'F5679A222C647C87527C2F8CB00A0BD1E2C63C11'; \
 	for key; do \
 		gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
 	done; \
-	gpg --batch --export "$@" > /etc/apt/trusted.gpg.d/mongodb.gpg; \
+	mkdir -p /etc/apt/keyrings; \
+	gpg --batch --export "$@" > /etc/apt/keyrings/mongodb.gpg; \
 	command -v gpgconf && gpgconf --kill all || :; \
-	rm -r "$GNUPGHOME"; \
-	apt-key list
+	rm -r "$GNUPGHOME"
 
 # Allow build-time overrides (eg. to build image with MongoDB Enterprise version)
 # Options for MONGO_PACKAGE: mongodb-org OR mongodb-enterprise
@@ -84,12 +84,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.4
-RUN echo "deb http://$MONGO_REPO/apt/ubuntu focal/${MONGO_PACKAGE%-unstable}/$MONGO_MAJOR multiverse" | tee "/etc/apt/sources.list.d/${MONGO_PACKAGE%-unstable}.list"
+ENV MONGO_MAJOR testing
+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"
 
 # http://docs.mongodb.org/master/release-notes/4.4/
-ENV MONGO_VERSION 4.4.12
-# 01/20/2022, https://github.com/mongodb/mongo/tree/51475a8c4d9856eb1461137e7539a0a763cc85dc
+ENV MONGO_VERSION 4.4.13~rc0
+# 02/24/2022, https://github.com/mongodb/mongo/tree/df25c71b8674a78e17468f48bcda5285decb9246
 
 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.4-rc-focal/docker-entrypoint.sh
similarity index 100%
copy from mongo_4-focal/docker-entrypoint.sh
copy to mongo_4.4-rc-focal/docker-entrypoint.sh
diff --git a/mongo_4-nanoserver-1809/Dockerfile b/mongo_4.4-rc-nanoserver-1809/Dockerfile
similarity index 75%
copy from mongo_4-nanoserver-1809/Dockerfile
copy to mongo_4.4-rc-nanoserver-1809/Dockerfile
index 6cc260b..e170af2 100644
--- a/mongo_4-nanoserver-1809/Dockerfile
+++ b/mongo_4.4-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:4.4.12-windowsservercore-1809 \
+COPY --from=mongo:4.4.13-rc0-windowsservercore-1809 \
 	C:\\Windows\\System32\\msvcp140.dll \
 	C:\\Windows\\System32\\vcruntime140.dll \
 	C:\\Windows\\System32\\vcruntime140_1.dll \
 	C:\\Windows\\System32\\
 
 # http://docs.mongodb.org/master/release-notes/4.4/
-ENV MONGO_VERSION 4.4.12
-# 01/20/2022, https://github.com/mongodb/mongo/tree/51475a8c4d9856eb1461137e7539a0a763cc85dc
+ENV MONGO_VERSION 4.4.13-rc0
+# 02/24/2022, https://github.com/mongodb/mongo/tree/df25c71b8674a78e17468f48bcda5285decb9246
 
-COPY --from=mongo:4.4.12-windowsservercore-1809 C:\\mongodb C:\\mongodb
+COPY --from=mongo:4.4.13-rc0-windowsservercore-1809 C:\\mongodb C:\\mongodb
 RUN mongo --version && mongod --version
 
 VOLUME C:\\data\\db C:\\data\\configdb
diff --git a/mongo_4-nanoserver-ltsc2022/Dockerfile b/mongo_4.4-rc-nanoserver-ltsc2022/Dockerfile
similarity index 74%
copy from mongo_4-nanoserver-ltsc2022/Dockerfile
copy to mongo_4.4-rc-nanoserver-ltsc2022/Dockerfile
index 358f985..5a3a245 100644
--- a/mongo_4-nanoserver-ltsc2022/Dockerfile
+++ b/mongo_4.4-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:4.4.12-windowsservercore-ltsc2022 \
+COPY --from=mongo:4.4.13-rc0-windowsservercore-ltsc2022 \
 	C:\\Windows\\System32\\msvcp140.dll \
 	C:\\Windows\\System32\\vcruntime140.dll \
 	C:\\Windows\\System32\\vcruntime140_1.dll \
 	C:\\Windows\\System32\\
 
 # http://docs.mongodb.org/master/release-notes/4.4/
-ENV MONGO_VERSION 4.4.12
-# 01/20/2022, https://github.com/mongodb/mongo/tree/51475a8c4d9856eb1461137e7539a0a763cc85dc
+ENV MONGO_VERSION 4.4.13-rc0
+# 02/24/2022, https://github.com/mongodb/mongo/tree/df25c71b8674a78e17468f48bcda5285decb9246
 
-COPY --from=mongo:4.4.12-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
+COPY --from=mongo:4.4.13-rc0-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
 RUN mongo --version && mongod --version
 
 VOLUME C:\\data\\db C:\\data\\configdb
diff --git a/mongo_4-windowsservercore-1809/Dockerfile b/mongo_4.4-rc-windowsservercore-1809/Dockerfile
similarity index 89%
copy from mongo_4-windowsservercore-1809/Dockerfile
copy to mongo_4.4-rc-windowsservercore-1809/Dockerfile
index 18499ca..96f2b65 100644
--- a/mongo_4-windowsservercore-1809/Dockerfile
+++ b/mongo_4.4-rc-windowsservercore-1809/Dockerfile
@@ -9,11 +9,11 @@ FROM mcr.microsoft.com/windows/servercore:1809
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
 
 # http://docs.mongodb.org/master/release-notes/4.4/
-ENV MONGO_VERSION 4.4.12
-# 01/20/2022, https://github.com/mongodb/mongo/tree/51475a8c4d9856eb1461137e7539a0a763cc85dc
+ENV MONGO_VERSION 4.4.13-rc0
+# 02/24/2022, https://github.com/mongodb/mongo/tree/df25c71b8674a78e17468f48bcda5285decb9246
 
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-4.4.12-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=a46ddabb46813c509555bdb012e34f0aadd12b5348a23ad7206fc18ac5a2fcd0
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-4.4.13-rc0-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=8942cb7d5eba2ac1875dc88a0b776d975f5680a17b56a9e8136556997f143223
 
 RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
diff --git a/mongo_4-windowsservercore-ltsc2022/Dockerfile b/mongo_4.4-rc-windowsservercore-ltsc2022/Dockerfile
similarity index 89%
copy from mongo_4-windowsservercore-ltsc2022/Dockerfile
copy to mongo_4.4-rc-windowsservercore-ltsc2022/Dockerfile
index 41ec428..3631598 100644
--- a/mongo_4-windowsservercore-ltsc2022/Dockerfile
+++ b/mongo_4.4-rc-windowsservercore-ltsc2022/Dockerfile
@@ -9,11 +9,11 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
 
 # http://docs.mongodb.org/master/release-notes/4.4/
-ENV MONGO_VERSION 4.4.12
-# 01/20/2022, https://github.com/mongodb/mongo/tree/51475a8c4d9856eb1461137e7539a0a763cc85dc
+ENV MONGO_VERSION 4.4.13-rc0
+# 02/24/2022, https://github.com/mongodb/mongo/tree/df25c71b8674a78e17468f48bcda5285decb9246
 
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-4.4.12-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=a46ddabb46813c509555bdb012e34f0aadd12b5348a23ad7206fc18ac5a2fcd0
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-4.4.13-rc0-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=8942cb7d5eba2ac1875dc88a0b776d975f5680a17b56a9e8136556997f143223
 
 RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
diff --git a/mongo_focal/Dockerfile b/mongo_focal/Dockerfile
index 2189033..f6e4170 100644
--- a/mongo_focal/Dockerfile
+++ b/mongo_focal/Dockerfile
@@ -71,10 +71,10 @@ RUN set -ex; \
 	for key; do \
 		gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
 	done; \
-	gpg --batch --export "$@" > /etc/apt/trusted.gpg.d/mongodb.gpg; \
+	mkdir -p /etc/apt/keyrings; \
+	gpg --batch --export "$@" > /etc/apt/keyrings/mongodb.gpg; \
 	command -v gpgconf && gpgconf --kill all || :; \
-	rm -r "$GNUPGHOME"; \
-	apt-key list
+	rm -r "$GNUPGHOME"
 
 # Allow build-time overrides (eg. to build image with MongoDB Enterprise version)
 # Options for MONGO_PACKAGE: mongodb-org OR mongodb-enterprise
@@ -85,7 +85,7 @@ ARG MONGO_REPO=repo.mongodb.org
 ENV MONGO_PACKAGE=${MONGO_PACKAGE} MONGO_REPO=${MONGO_REPO}
 
 ENV MONGO_MAJOR 5.0
-RUN echo "deb http://$MONGO_REPO/apt/ubuntu focal/${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"
 
 # http://docs.mongodb.org/master/release-notes/5.0/
 ENV MONGO_VERSION 5.0.6

Relevant Maintainers:

@yosifkit yosifkit merged commit afab9fc into docker-library:master Mar 1, 2022
@yosifkit yosifkit deleted the mongo branch March 1, 2022 01:38
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