Add mongo-* workaround for SERVER-67788 #12745
Merged
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
|
Hopefully, the upstream issue will be resolved later and we can revert this 👀 |
|
Pushed fc3201e to verify this against the actual failing version 👀 |
Diff for fc3201e:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 53d29ba..b753da3 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,5 +1,6 @@
Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
-GitRepo: https://github.com/docker-library/mongo.git
+GitRepo: https://github.com/infosiftr/mongo.git
+GitFetch: refs/heads/4.4.15
Tags: 4.0.28-nanoserver-1809, 4.0-nanoserver-1809
SharedTags: 4.0.28-nanoserver, 4.0-nanoserver
@@ -69,37 +70,37 @@ GitCommit: 532d38e4ce042177caa7049efdabf8dc1a60697a
Directory: 4.2/windows/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
-Tags: 4.4.14-focal, 4.4-focal, 4-focal
-SharedTags: 4.4.14, 4.4, 4
+Tags: 4.4.15-focal, 4.4-focal, 4-focal
+SharedTags: 4.4.15, 4.4, 4
Architectures: amd64, arm64v8
-GitCommit: 666ae6bd40f658bbdcb47587289572374756e031
+GitCommit: 7e0352ac20f1cd29bef0d4747959e091a5bd1e48
Directory: 4.4
-Tags: 4.4.14-nanoserver-1809, 4.4-nanoserver-1809, 4-nanoserver-1809
-SharedTags: 4.4.14-nanoserver, 4.4-nanoserver, 4-nanoserver
+Tags: 4.4.15-nanoserver-1809, 4.4-nanoserver-1809, 4-nanoserver-1809
+SharedTags: 4.4.15-nanoserver, 4.4-nanoserver, 4-nanoserver
Architectures: windows-amd64
-GitCommit: d7fcf97417a9cb67f4677a85db7050980ed63580
+GitCommit: 7e0352ac20f1cd29bef0d4747959e091a5bd1e48
Directory: 4.4/windows/nanoserver-1809
Constraints: nanoserver-1809, windowsservercore-1809
-Tags: 4.4.14-nanoserver-ltsc2022, 4.4-nanoserver-ltsc2022, 4-nanoserver-ltsc2022
-SharedTags: 4.4.14-nanoserver, 4.4-nanoserver, 4-nanoserver
+Tags: 4.4.15-nanoserver-ltsc2022, 4.4-nanoserver-ltsc2022, 4-nanoserver-ltsc2022
+SharedTags: 4.4.15-nanoserver, 4.4-nanoserver, 4-nanoserver
Architectures: windows-amd64
-GitCommit: d7fcf97417a9cb67f4677a85db7050980ed63580
+GitCommit: 7e0352ac20f1cd29bef0d4747959e091a5bd1e48
Directory: 4.4/windows/nanoserver-ltsc2022
Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
-Tags: 4.4.14-windowsservercore-1809, 4.4-windowsservercore-1809, 4-windowsservercore-1809
-SharedTags: 4.4.14-windowsservercore, 4.4-windowsservercore, 4-windowsservercore, 4.4.14, 4.4, 4
+Tags: 4.4.15-windowsservercore-1809, 4.4-windowsservercore-1809, 4-windowsservercore-1809
+SharedTags: 4.4.15-windowsservercore, 4.4-windowsservercore, 4-windowsservercore, 4.4.15, 4.4, 4
Architectures: windows-amd64
-GitCommit: d7fcf97417a9cb67f4677a85db7050980ed63580
+GitCommit: 7e0352ac20f1cd29bef0d4747959e091a5bd1e48
Directory: 4.4/windows/windowsservercore-1809
Constraints: windowsservercore-1809
-Tags: 4.4.14-windowsservercore-ltsc2022, 4.4-windowsservercore-ltsc2022, 4-windowsservercore-ltsc2022
-SharedTags: 4.4.14-windowsservercore, 4.4-windowsservercore, 4-windowsservercore, 4.4.14, 4.4, 4
+Tags: 4.4.15-windowsservercore-ltsc2022, 4.4-windowsservercore-ltsc2022, 4-windowsservercore-ltsc2022
+SharedTags: 4.4.15-windowsservercore, 4.4-windowsservercore, 4-windowsservercore, 4.4.15, 4.4, 4
Architectures: windows-amd64
-GitCommit: d7fcf97417a9cb67f4677a85db7050980ed63580
+GitCommit: 7e0352ac20f1cd29bef0d4747959e091a5bd1e48
Directory: 4.4/windows/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 5da894a..37fa06f 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -46,14 +46,14 @@ mongo:4.4-nanoserver-ltsc2022
mongo:4.4-windowsservercore
mongo:4.4-windowsservercore-1809
mongo:4.4-windowsservercore-ltsc2022
-mongo:4.4.14
-mongo:4.4.14-focal
-mongo:4.4.14-nanoserver
-mongo:4.4.14-nanoserver-1809
-mongo:4.4.14-nanoserver-ltsc2022
-mongo:4.4.14-windowsservercore
-mongo:4.4.14-windowsservercore-1809
-mongo:4.4.14-windowsservercore-ltsc2022
+mongo:4.4.15
+mongo:4.4.15-focal
+mongo:4.4.15-nanoserver
+mongo:4.4.15-nanoserver-1809
+mongo:4.4.15-nanoserver-ltsc2022
+mongo:4.4.15-windowsservercore
+mongo:4.4.15-windowsservercore-1809
+mongo:4.4.15-windowsservercore-ltsc2022
mongo:5
mongo:5-focal
mongo:5-nanoserver
diff --git a/mongo_4-focal/Dockerfile b/mongo_4-focal/Dockerfile
index c425b8a..6c593c4 100644
--- a/mongo_4-focal/Dockerfile
+++ b/mongo_4-focal/Dockerfile
@@ -92,8 +92,8 @@ ENV MONGO_MAJOR 4.4
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"
# https://docs.mongodb.org/master/release-notes/4.4/
-ENV MONGO_VERSION 4.4.14
-# 05/04/2022, https://github.com/mongodb/mongo/tree/0b0843af97c3ec9d2c0995152d96d2aad725aab7
+ENV MONGO_VERSION 4.4.15
+# 06/15/2022, https://github.com/mongodb/mongo/tree/bc17cf2c788c5dda2801a090ea79da5ff7d5fac9
RUN set -x \
# installing "mongodb-enterprise" pulls in "tzdata" which prompts for input
diff --git a/mongo_4-nanoserver-1809/Dockerfile b/mongo_4-nanoserver-1809/Dockerfile
index 83462fe..a50c40b 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.14-windowsservercore-1809 \
+COPY --from=mongo:4.4.15-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.14
-# 05/04/2022, https://github.com/mongodb/mongo/tree/0b0843af97c3ec9d2c0995152d96d2aad725aab7
+ENV MONGO_VERSION 4.4.15
+# 06/15/2022, https://github.com/mongodb/mongo/tree/bc17cf2c788c5dda2801a090ea79da5ff7d5fac9
-COPY --from=mongo:4.4.14-windowsservercore-1809 C:\\mongodb C:\\mongodb
+COPY --from=mongo:4.4.15-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-nanoserver-ltsc2022/Dockerfile
index b499c53..5ac600c 100644
--- a/mongo_4-nanoserver-ltsc2022/Dockerfile
+++ b/mongo_4-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.14-windowsservercore-ltsc2022 \
+COPY --from=mongo:4.4.15-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/4.4/
-ENV MONGO_VERSION 4.4.14
-# 05/04/2022, https://github.com/mongodb/mongo/tree/0b0843af97c3ec9d2c0995152d96d2aad725aab7
+ENV MONGO_VERSION 4.4.15
+# 06/15/2022, https://github.com/mongodb/mongo/tree/bc17cf2c788c5dda2801a090ea79da5ff7d5fac9
-COPY --from=mongo:4.4.14-windowsservercore-ltsc2022 C:\\mongodb C:\\mongodb
+COPY --from=mongo:4.4.15-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-windowsservercore-1809/Dockerfile
index abfe659..a013bb9 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';"]
# https://docs.mongodb.org/master/release-notes/4.4/
-ENV MONGO_VERSION 4.4.14
-# 05/04/2022, https://github.com/mongodb/mongo/tree/0b0843af97c3ec9d2c0995152d96d2aad725aab7
+ENV MONGO_VERSION 4.4.15
+# 06/15/2022, https://github.com/mongodb/mongo/tree/bc17cf2c788c5dda2801a090ea79da5ff7d5fac9
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-4.4.14-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=beb8d11bbf2c02142fe774cac16752281a8f0a61788d684a495337e288c63501
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-4.4.15-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=cac59647e791ef572d2706c82ed3d5e8fdb2c93e0680a3d18a8a831e7ee35a36
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-windowsservercore-ltsc2022/Dockerfile
index c7a6be4..8ab76e3 100644
--- a/mongo_4-windowsservercore-ltsc2022/Dockerfile
+++ b/mongo_4-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.4/
-ENV MONGO_VERSION 4.4.14
-# 05/04/2022, https://github.com/mongodb/mongo/tree/0b0843af97c3ec9d2c0995152d96d2aad725aab7
+ENV MONGO_VERSION 4.4.15
+# 06/15/2022, https://github.com/mongodb/mongo/tree/bc17cf2c788c5dda2801a090ea79da5ff7d5fac9
-ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-4.4.14-signed.msi
-ENV MONGO_DOWNLOAD_SHA256=beb8d11bbf2c02142fe774cac16752281a8f0a61788d684a495337e288c63501
+ENV MONGO_DOWNLOAD_URL https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-4.4.15-signed.msi
+ENV MONGO_DOWNLOAD_SHA256=cac59647e791ef572d2706c82ed3d5e8fdb2c93e0680a3d18a8a831e7ee35a36
RUN Write-Host ('Downloading {0} ...' -f $env:MONGO_DOWNLOAD_URL); \
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \Relevant Maintainers: |
|
Gold! https://github.com/docker-library/official-images/runs/7204795909?check_suite_focus=true#step:8:18 + set -- mongo:4.4.15-focal
+ '[' -s ./.test/config.sh ']'
+ ./test/run.sh mongo:4.4.15-focal
testing mongo:4.4.15-focal
'utc' [1/7]...passed
'no-hard-coded-passwords' [2/7]...passed
'override-cmd' [3/7]...passed
'mongo-basics' [4/7]...passed
'mongo-auth-basics' [5/7]...passed
'mongo-tls-basics' [6/7]...passed
'mongo-tls-auth' [7/7]...passed
...... |
tianon
force-pushed
the
mongo-SERVER-67788
branch
from
fc3201e to
edae137
Compare
vorsel
added a commit
to vorsel/percona-docker
that referenced
this pull request
Jul 20, 2022
The fix was taken from upstream docker-library/official-images repo: docker-library/official-images#12745
vorsel
added a commit
to percona/percona-docker
that referenced
this pull request
Jul 20, 2022
The fix was taken from upstream docker-library/official-images repo: docker-library/official-images#12745
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.
See https://jira.mongodb.org/browse/SERVER-67788
Refs docker-library/mongo#548