Update mongo #10552
Merged
Update mongo #10552
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@d466545: Update 4.2-rc with 5.0 key - docker-library/mongo@77032bf: Update 5.0 to the proper repo signing key - docker-library/mongo@a952097: Update 4.4-rc - docker-library/mongo@babc077: Update 4.4 to 4.4.7 - docker-library/mongo@d4c6efc: Update 4.0-rc to 4.0.26-rc0
Diff for dab34d6:diff --git a/_bashbrew-cat b/_bashbrew-cat
index e0a954d..40cad12 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -28,6 +28,33 @@ Architectures: amd64, arm64v8
GitCommit: cb8a419053858e510fc68ed2d69415b3e50011cb
Directory: 4.0
+Tags: 4.0.26-rc0-nanoserver-1809, 4.0-rc-nanoserver-1809
+SharedTags: 4.0.26-rc0-nanoserver, 4.0-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: d4c6efcbd77e11b64e5351fec953fd870678bc56
+Directory: 4.0-rc/windows/nanoserver-1809
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 4.0.26-rc0-windowsservercore-1809, 4.0-rc-windowsservercore-1809
+SharedTags: 4.0.26-rc0-windowsservercore, 4.0-rc-windowsservercore, 4.0.26-rc0, 4.0-rc
+Architectures: windows-amd64
+GitCommit: d4c6efcbd77e11b64e5351fec953fd870678bc56
+Directory: 4.0-rc/windows/windowsservercore-1809
+Constraints: windowsservercore-1809
+
+Tags: 4.0.26-rc0-windowsservercore-ltsc2016, 4.0-rc-windowsservercore-ltsc2016
+SharedTags: 4.0.26-rc0-windowsservercore, 4.0-rc-windowsservercore, 4.0.26-rc0, 4.0-rc
+Architectures: windows-amd64
+GitCommit: d4c6efcbd77e11b64e5351fec953fd870678bc56
+Directory: 4.0-rc/windows/windowsservercore-ltsc2016
+Constraints: windowsservercore-ltsc2016
+
+Tags: 4.0.26-rc0-xenial, 4.0-rc-xenial
+SharedTags: 4.0.26-rc0, 4.0-rc
+Architectures: amd64, arm64v8
+GitCommit: d466545d871e564eade95f3046c0119432272812
+Directory: 4.0-rc
+
Tags: 4.2.15-bionic, 4.2-bionic
SharedTags: 4.2.15, 4.2
Architectures: amd64, arm64v8
@@ -55,64 +82,37 @@ GitCommit: 71291370ed14fcec09a2f8da8edd6d24062516c9
Directory: 4.2/windows/windowsservercore-ltsc2016
Constraints: windowsservercore-ltsc2016
-Tags: 4.4.6-bionic, 4.4-bionic, 4-bionic
-SharedTags: 4.4.6, 4.4, 4
-Architectures: amd64, arm64v8, s390x
-GitCommit: cb8a419053858e510fc68ed2d69415b3e50011cb
+Tags: 4.4.7-focal, 4.4-focal, 4-focal
+SharedTags: 4.4.7, 4.4, 4
+Architectures: amd64, arm64v8
+GitCommit: babc077da86d7ab12a225300feb71fa3b309b1da
Directory: 4.4
-Tags: 4.4.6-nanoserver-1809, 4.4-nanoserver-1809, 4-nanoserver-1809
-SharedTags: 4.4.6-nanoserver, 4.4-nanoserver, 4-nanoserver
+Tags: 4.4.7-nanoserver-1809, 4.4-nanoserver-1809, 4-nanoserver-1809
+SharedTags: 4.4.7-nanoserver, 4.4-nanoserver, 4-nanoserver
Architectures: windows-amd64
-GitCommit: dc35ba55761b2f03ce2f79ff3b79783b15e23dae
+GitCommit: babc077da86d7ab12a225300feb71fa3b309b1da
Directory: 4.4/windows/nanoserver-1809
Constraints: nanoserver-1809, windowsservercore-1809
-Tags: 4.4.6-windowsservercore-1809, 4.4-windowsservercore-1809, 4-windowsservercore-1809
-SharedTags: 4.4.6-windowsservercore, 4.4-windowsservercore, 4-windowsservercore, 4.4.6, 4.4, 4
+Tags: 4.4.7-windowsservercore-1809, 4.4-windowsservercore-1809, 4-windowsservercore-1809
+SharedTags: 4.4.7-windowsservercore, 4.4-windowsservercore, 4-windowsservercore, 4.4.7, 4.4, 4
Architectures: windows-amd64
-GitCommit: dc35ba55761b2f03ce2f79ff3b79783b15e23dae
+GitCommit: babc077da86d7ab12a225300feb71fa3b309b1da
Directory: 4.4/windows/windowsservercore-1809
Constraints: windowsservercore-1809
-Tags: 4.4.6-windowsservercore-ltsc2016, 4.4-windowsservercore-ltsc2016, 4-windowsservercore-ltsc2016
-SharedTags: 4.4.6-windowsservercore, 4.4-windowsservercore, 4-windowsservercore, 4.4.6, 4.4, 4
+Tags: 4.4.7-windowsservercore-ltsc2016, 4.4-windowsservercore-ltsc2016, 4-windowsservercore-ltsc2016
+SharedTags: 4.4.7-windowsservercore, 4.4-windowsservercore, 4-windowsservercore, 4.4.7, 4.4, 4
Architectures: windows-amd64
-GitCommit: dc35ba55761b2f03ce2f79ff3b79783b15e23dae
+GitCommit: babc077da86d7ab12a225300feb71fa3b309b1da
Directory: 4.4/windows/windowsservercore-ltsc2016
Constraints: windowsservercore-ltsc2016
-Tags: 4.4.7-rc1-focal, 4.4-rc-focal
-SharedTags: 4.4.7-rc1, 4.4-rc
-Architectures: amd64, arm64v8
-GitCommit: 150ca8f51af6a27de95db38a82d7b9ec7febf622
-Directory: 4.4-rc
-
-Tags: 4.4.7-rc1-nanoserver-1809, 4.4-rc-nanoserver-1809
-SharedTags: 4.4.7-rc1-nanoserver, 4.4-rc-nanoserver
-Architectures: windows-amd64
-GitCommit: 36a2be58c6bfae49e10b7114bc6585cc0c8495a5
-Directory: 4.4-rc/windows/nanoserver-1809
-Constraints: nanoserver-1809, windowsservercore-1809
-
-Tags: 4.4.7-rc1-windowsservercore-1809, 4.4-rc-windowsservercore-1809
-SharedTags: 4.4.7-rc1-windowsservercore, 4.4-rc-windowsservercore, 4.4.7-rc1, 4.4-rc
-Architectures: windows-amd64
-GitCommit: 36a2be58c6bfae49e10b7114bc6585cc0c8495a5
-Directory: 4.4-rc/windows/windowsservercore-1809
-Constraints: windowsservercore-1809
-
-Tags: 4.4.7-rc1-windowsservercore-ltsc2016, 4.4-rc-windowsservercore-ltsc2016
-SharedTags: 4.4.7-rc1-windowsservercore, 4.4-rc-windowsservercore, 4.4.7-rc1, 4.4-rc
-Architectures: windows-amd64
-GitCommit: 36a2be58c6bfae49e10b7114bc6585cc0c8495a5
-Directory: 4.4-rc/windows/windowsservercore-ltsc2016
-Constraints: windowsservercore-ltsc2016
-
Tags: 5.0.0-focal, 5.0-focal, 5-focal, focal
SharedTags: 5.0.0, 5.0, 5, latest
Architectures: amd64, arm64v8
-GitCommit: a698211badf02a36589e4375c6e2edb0da587656
+GitCommit: 77032bf6c28886951e5b10ebeb6602b5fe0a6f61
Directory: 5.0
Tags: 5.0.0-nanoserver-1809, 5.0-nanoserver-1809, 5-nanoserver-1809, nanoserver-1809
diff --git a/_bashbrew-list b/_bashbrew-list
index abd3e87..6a85d2b 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,5 +1,5 @@
mongo:4
-mongo:4-bionic
+mongo:4-focal
mongo:4-nanoserver
mongo:4-nanoserver-1809
mongo:4-windowsservercore
@@ -8,6 +8,13 @@ mongo:4-windowsservercore-ltsc2016
mongo:4.0
mongo:4.0-nanoserver
mongo:4.0-nanoserver-1809
+mongo:4.0-rc
+mongo:4.0-rc-nanoserver
+mongo:4.0-rc-nanoserver-1809
+mongo:4.0-rc-windowsservercore
+mongo:4.0-rc-windowsservercore-1809
+mongo:4.0-rc-windowsservercore-ltsc2016
+mongo:4.0-rc-xenial
mongo:4.0-windowsservercore
mongo:4.0-windowsservercore-1809
mongo:4.0-windowsservercore-ltsc2016
@@ -19,6 +26,13 @@ mongo:4.0.25-windowsservercore
mongo:4.0.25-windowsservercore-1809
mongo:4.0.25-windowsservercore-ltsc2016
mongo:4.0.25-xenial
+mongo:4.0.26-rc0
+mongo:4.0.26-rc0-nanoserver
+mongo:4.0.26-rc0-nanoserver-1809
+mongo:4.0.26-rc0-windowsservercore
+mongo:4.0.26-rc0-windowsservercore-1809
+mongo:4.0.26-rc0-windowsservercore-ltsc2016
+mongo:4.0.26-rc0-xenial
mongo:4.2
mongo:4.2-bionic
mongo:4.2-nanoserver
@@ -34,33 +48,19 @@ mongo:4.2.15-windowsservercore
mongo:4.2.15-windowsservercore-1809
mongo:4.2.15-windowsservercore-ltsc2016
mongo:4.4
-mongo:4.4-bionic
+mongo:4.4-focal
mongo:4.4-nanoserver
mongo:4.4-nanoserver-1809
-mongo:4.4-rc
-mongo:4.4-rc-focal
-mongo:4.4-rc-nanoserver
-mongo:4.4-rc-nanoserver-1809
-mongo:4.4-rc-windowsservercore
-mongo:4.4-rc-windowsservercore-1809
-mongo:4.4-rc-windowsservercore-ltsc2016
mongo:4.4-windowsservercore
mongo:4.4-windowsservercore-1809
mongo:4.4-windowsservercore-ltsc2016
-mongo:4.4.6
-mongo:4.4.6-bionic
-mongo:4.4.6-nanoserver
-mongo:4.4.6-nanoserver-1809
-mongo:4.4.6-windowsservercore
-mongo:4.4.6-windowsservercore-1809
-mongo:4.4.6-windowsservercore-ltsc2016
-mongo:4.4.7-rc1
-mongo:4.4.7-rc1-focal
-mongo:4.4.7-rc1-nanoserver
-mongo:4.4.7-rc1-nanoserver-1809
-mongo:4.4.7-rc1-windowsservercore
-mongo:4.4.7-rc1-windowsservercore-1809
-mongo:4.4.7-rc1-windowsservercore-ltsc2016
+mongo:4.4.7
+mongo:4.4.7-focal
+mongo:4.4.7-nanoserver
+mongo:4.4.7-nanoserver-1809
+mongo:4.4.7-windowsservercore
+mongo:4.4.7-windowsservercore-1809
+mongo:4.4.7-windowsservercore-ltsc2016
mongo:5
mongo:5-focal
mongo:5-nanoserver
diff --git a/mongo_4.4-rc-focal/Dockerfile b/mongo_4-focal/Dockerfile
similarity index 93%
rename from mongo_4.4-rc-focal/Dockerfile
rename to mongo_4-focal/Dockerfile
index 42f0a32..54188ee 100644
--- a/mongo_4.4-rc-focal/Dockerfile
+++ b/mongo_4-focal/Dockerfile
@@ -67,7 +67,7 @@ RUN mkdir /docker-entrypoint-initdb.d
RUN set -ex; \
export GNUPGHOME="$(mktemp -d)"; \
- set -- '20691EEC35216C63CAF66CE1656408E390CFB1F5' '20691EEC35216C63CAF66CE1656408E390CFB1F5' '9DA31620334BD75D9DCB49F368818C72E52529D4' 'E162F504A20CDF15827F718D4B7C549A058F8B6B'; \
+ set -- '20691EEC35216C63CAF66CE1656408E390CFB1F5'; \
for key; do \
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
done; \
@@ -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 testing
+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"
# http://docs.mongodb.org/master/release-notes/4.4/
-ENV MONGO_VERSION 4.4.7~rc1
-# 07/07/2021, https://github.com/mongodb/mongo/tree/abb6b9c2bf675e9e2aeaecba05f0f8359d99e203
+ENV MONGO_VERSION 4.4.7
+# 07/14/2021, https://github.com/mongodb/mongo/tree/abb6b9c2bf675e9e2aeaecba05f0f8359d99e203
RUN set -x \
# installing "mongodb-enterprise" pulls in "tzdata" which prompts for input
diff --git a/mongo_4-bionic/docker-entrypoint.sh b/mongo_4-focal/docker-entrypoint.sh
similarity index 100%
rename from mongo_4-bionic/docker-entrypoint.sh
rename to mongo_4-focal/docker-entrypoint.sh
diff --git a/mongo_4-nanoserver-1809/Dockerfile b/mongo_4-nanoserver-1809/Dockerfile
index ab429ad..2e6d5af 100644
--- a/mongo_4-nanoserver-1809/Dockerfile
+++ b/mongo_4-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.6-windowsservercore-1809 \
+COPY --from=mongo:4.4.7-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.6
-# 05/07/2021, https://github.com/mongodb/mongo/tree/72e66213c2c3eab37d9358d5e78ad7f5c1d0d0d7
+ENV MONGO_VERSION 4.4.7
+# 07/14/2021, https://github.com/mongodb/mongo/tree/abb6b9c2bf675e9e2aeaecba05f0f8359d99e203
-COPY --from=mongo:4.4.6-windowsservercore-1809 C:\\mongodb C:\\mongodb
+COPY --from=mongo:4.4.7-windowsservercore-1809 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-windowsservercore-1809/Dockerfile
index c362bda..8cacd62 100644
--- a/mongo_4-windowsservercore-1809/Dockerfile
+++ b/mongo_4-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.6
-# 05/07/2021, https://github.com/mongodb/mongo/tree/72e66213c2c3eab37d9358d5e78ad7f5c1d0d0d7
+ENV MONGO_VERSION 4.4.7
+# 07/14/2021, https://github.com/mongodb/mongo/tree/abb6b9c2bf675e9e2aeaecba05f0f8359d99e203
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-4.4.6-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=ede50e8f8d8c9d23a8ca2cc1c96cdb9bcc1f617930e8bd1d46f21d95d0b555f8
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-4.4.7-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=262b28c79ea8305b28be3257e3f548344998bf18891a79d8780ef2e94d70ed86
RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
diff --git a/mongo_4-windowsservercore-ltsc2016/Dockerfile b/mongo_4-windowsservercore-ltsc2016/Dockerfile
index 9e29bc3..8dabc9f 100644
--- a/mongo_4-windowsservercore-ltsc2016/Dockerfile
+++ b/mongo_4-windowsservercore-ltsc2016/Dockerfile
@@ -9,11 +9,11 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
# http://docs.mongodb.org/master/release-notes/4.4/
-ENV MONGO_VERSION 4.4.6
-# 05/07/2021, https://github.com/mongodb/mongo/tree/72e66213c2c3eab37d9358d5e78ad7f5c1d0d0d7
+ENV MONGO_VERSION 4.4.7
+# 07/14/2021, https://github.com/mongodb/mongo/tree/abb6b9c2bf675e9e2aeaecba05f0f8359d99e203
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-4.4.6-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=ede50e8f8d8c9d23a8ca2cc1c96cdb9bcc1f617930e8bd1d46f21d95d0b555f8
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-4.4.7-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=262b28c79ea8305b28be3257e3f548344998bf18891a79d8780ef2e94d70ed86
RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
diff --git a/mongo_4.0-nanoserver-1809/Dockerfile b/mongo_4.0-rc-nanoserver-1809/Dockerfile
similarity index 73%
copy from mongo_4.0-nanoserver-1809/Dockerfile
copy to mongo_4.0-rc-nanoserver-1809/Dockerfile
index 910cf72..8b495ab 100644
--- a/mongo_4.0-nanoserver-1809/Dockerfile
+++ b/mongo_4.0-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.0.25-windowsservercore-1809 \
+COPY --from=mongo:4.0.26-rc0-windowsservercore-1809 \
C:\\Windows\\System32\\msvcp140.dll \
C:\\Windows\\System32\\vcruntime140.dll \
C:\\Windows\\System32\\
# http://docs.mongodb.org/master/release-notes/4.0/
-ENV MONGO_VERSION 4.0.25
-# 06/08/2021, https://github.com/mongodb/mongo/tree/89306fde6167fa12ea6e30d61e05791e8e214e55
+ENV MONGO_VERSION 4.0.26-rc0
+# 07/16/2021, https://github.com/mongodb/mongo/tree/f12d07945bd82ff9b6726aa74b84ea4e94b06171
-COPY --from=mongo:4.0.25-windowsservercore-1809 C:\\mongodb C:\\mongodb
+COPY --from=mongo:4.0.26-rc0-windowsservercore-1809 C:\\mongodb C:\\mongodb
RUN mongo --version && mongod --version
VOLUME C:\\data\\db C:\\data\\configdb
diff --git a/mongo_4.4-rc-windowsservercore-1809/Dockerfile b/mongo_4.0-rc-windowsservercore-1809/Dockerfile
similarity index 84%
rename from mongo_4.4-rc-windowsservercore-1809/Dockerfile
rename to mongo_4.0-rc-windowsservercore-1809/Dockerfile
index abc6c52..081e441 100644
--- a/mongo_4.4-rc-windowsservercore-1809/Dockerfile
+++ b/mongo_4.0-rc-windowsservercore-1809/Dockerfile
@@ -8,12 +8,12 @@ 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.7-rc1
-# 07/07/2021, https://github.com/mongodb/mongo/tree/abb6b9c2bf675e9e2aeaecba05f0f8359d99e203
+# http://docs.mongodb.org/master/release-notes/4.0/
+ENV MONGO_VERSION 4.0.26-rc0
+# 07/16/2021, https://github.com/mongodb/mongo/tree/f12d07945bd82ff9b6726aa74b84ea4e94b06171
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-4.4.7-rc1-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=6813de46869340d0a47201fa148b875be91a7b26b926b9b2e3fd82def79ef167
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2008plus-ssl-4.0.26-rc0-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=0060783c185c33f688c310f4626a74dc9d6947da26f1b14aee85c68f26f0748c
RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
diff --git a/mongo_4.4-rc-windowsservercore-ltsc2016/Dockerfile b/mongo_4.0-rc-windowsservercore-ltsc2016/Dockerfile
similarity index 84%
rename from mongo_4.4-rc-windowsservercore-ltsc2016/Dockerfile
rename to mongo_4.0-rc-windowsservercore-ltsc2016/Dockerfile
index e80ac4d..7b8e6f7 100644
--- a/mongo_4.4-rc-windowsservercore-ltsc2016/Dockerfile
+++ b/mongo_4.0-rc-windowsservercore-ltsc2016/Dockerfile
@@ -8,12 +8,12 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
-# http://docs.mongodb.org/master/release-notes/4.4/
-ENV MONGO_VERSION 4.4.7-rc1
-# 07/07/2021, https://github.com/mongodb/mongo/tree/abb6b9c2bf675e9e2aeaecba05f0f8359d99e203
+# http://docs.mongodb.org/master/release-notes/4.0/
+ENV MONGO_VERSION 4.0.26-rc0
+# 07/16/2021, https://github.com/mongodb/mongo/tree/f12d07945bd82ff9b6726aa74b84ea4e94b06171
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-4.4.7-rc1-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=6813de46869340d0a47201fa148b875be91a7b26b926b9b2e3fd82def79ef167
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2008plus-ssl-4.0.26-rc0-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=0060783c185c33f688c310f4626a74dc9d6947da26f1b14aee85c68f26f0748c
RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
diff --git a/mongo_4-bionic/Dockerfile b/mongo_4.0-rc-xenial/Dockerfile
similarity index 90%
rename from mongo_4-bionic/Dockerfile
rename to mongo_4.0-rc-xenial/Dockerfile
index 6512c54..ca5147d 100644
--- a/mongo_4-bionic/Dockerfile
+++ b/mongo_4.0-rc-xenial/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM ubuntu:bionic
+FROM ubuntu:xenial
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
RUN groupadd -r mongodb && useradd -r -g mongodb mongodb
@@ -67,7 +67,7 @@ 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; \
@@ -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 bionic/${MONGO_PACKAGE%-unstable}/$MONGO_MAJOR multiverse" | tee "/etc/apt/sources.list.d/${MONGO_PACKAGE%-unstable}.list"
+ENV MONGO_MAJOR testing
+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"
-# http://docs.mongodb.org/master/release-notes/4.4/
-ENV MONGO_VERSION 4.4.6
-# 05/07/2021, https://github.com/mongodb/mongo/tree/72e66213c2c3eab37d9358d5e78ad7f5c1d0d0d7
+# http://docs.mongodb.org/master/release-notes/4.0/
+ENV MONGO_VERSION 4.0.26~rc0
+# 07/16/2021, https://github.com/mongodb/mongo/tree/f12d07945bd82ff9b6726aa74b84ea4e94b06171
RUN set -x \
# installing "mongodb-enterprise" pulls in "tzdata" which prompts for input
diff --git a/mongo_4.4-rc-focal/docker-entrypoint.sh b/mongo_4.0-rc-xenial/docker-entrypoint.sh
similarity index 100%
rename from mongo_4.4-rc-focal/docker-entrypoint.sh
rename to mongo_4.0-rc-xenial/docker-entrypoint.sh
diff --git a/mongo_4.4-rc-nanoserver-1809/Dockerfile b/mongo_4.4-rc-nanoserver-1809/Dockerfile
deleted file mode 100644
index 7664fd7..0000000
diff --git a/mongo_focal/Dockerfile b/mongo_focal/Dockerfile
index 36ef016..674cd43 100644
--- a/mongo_focal/Dockerfile
+++ b/mongo_focal/Dockerfile
@@ -67,7 +67,7 @@ RUN mkdir /docker-entrypoint-initdb.d
RUN set -ex; \
export GNUPGHOME="$(mktemp -d)"; \
- set -- '20691EEC35216C63CAF66CE1656408E390CFB1F5'; \
+ set -- 'F5679A222C647C87527C2F8CB00A0BD1E2C63C11'; \
for key; do \
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
done; \
|
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: