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

Merged
merged 1 commit into from
Mar 3, 2023
Merged

Update mongo #14189

merged 1 commit into from
Mar 3, 2023

Conversation

yosifkit
Copy link
Member

@yosifkit yosifkit commented Mar 3, 2023

Changes:

Changes:

- docker-library/mongo@394e74e: Merge pull request docker-library/mongo#610 from infosiftr/more-arm64v8.2
- docker-library/mongo@9ba70e0: Extend warning for ARMv8.2-A
@github-actions
Copy link

github-actions bot commented Mar 3, 2023

Diff for 0b33ba2:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6416db8..881db49 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,7 +4,7 @@ GitRepo: https://github.com/docker-library/mongo.git
 Tags: 4.2.24-bionic, 4.2-bionic
 SharedTags: 4.2.24, 4.2
 Architectures: amd64, arm64v8
-GitCommit: c597a2eee3a69b43f7ce07f1d83a0b1e1788eb51
+GitCommit: 9ba70e0a39fd2205899a9bb72e2204e3fcdbdc56
 Directory: 4.2
 
 Tags: 4.2.24-nanoserver-1809, 4.2-nanoserver-1809
@@ -38,7 +38,7 @@ Constraints: windowsservercore-ltsc2022
 Tags: 4.4.19-focal, 4.4-focal, 4-focal
 SharedTags: 4.4.19, 4.4, 4
 Architectures: amd64, arm64v8
-GitCommit: eb4960f9cc692e9be3332ccccb86fedf2a5a92d5
+GitCommit: 9ba70e0a39fd2205899a9bb72e2204e3fcdbdc56
 Directory: 4.4
 
 Tags: 4.4.19-nanoserver-1809, 4.4-nanoserver-1809, 4-nanoserver-1809
@@ -72,7 +72,7 @@ Constraints: windowsservercore-ltsc2022
 Tags: 5.0.15-focal, 5.0-focal, 5-focal
 SharedTags: 5.0.15, 5.0, 5
 Architectures: amd64, arm64v8
-GitCommit: 4bde9c88f7479d4f0281bc3793d0eabb22ec7e6b
+GitCommit: 9ba70e0a39fd2205899a9bb72e2204e3fcdbdc56
 Directory: 5.0
 
 Tags: 5.0.15-nanoserver-1809, 5.0-nanoserver-1809, 5-nanoserver-1809
@@ -106,7 +106,7 @@ Constraints: windowsservercore-ltsc2022
 Tags: 6.0.4-jammy, 6.0-jammy, 6-jammy, jammy
 SharedTags: 6.0.4, 6.0, 6, latest
 Architectures: amd64, arm64v8
-GitCommit: 840d7ed246dc72ae9e84ce92b9f5a6f9dfa4d6e1
+GitCommit: 9ba70e0a39fd2205899a9bb72e2204e3fcdbdc56
 Directory: 6.0
 
 Tags: 6.0.4-nanoserver-1809, 6.0-nanoserver-1809, 6-nanoserver-1809, nanoserver-1809
diff --git a/mongo_4-focal/docker-entrypoint.sh b/mongo_4-focal/docker-entrypoint.sh
index 0073c4f..f24112f 100755
--- a/mongo_4-focal/docker-entrypoint.sh
+++ b/mongo_4-focal/docker-entrypoint.sh
@@ -43,7 +43,9 @@ case "$dpkgArch" in
 		if ! grep -qE '^Features.* (fphp|dcpop|sha3|sm3|sm4|asimddp|sha512|sve)( .*|$)' /proc/cpuinfo; then
 			{
 				echo
-				echo 'WARNING: MongoDB 5.0+ requires ARMv8.2-A or higher, and your current system does not appear to implement any of the common features for that!'
+				echo 'WARNING: MongoDB requires ARMv8.2-A or higher, and your current system does not appear to implement any of the common features for that!'
+				echo '  applies to all versions ≥5.0, any of 4.4 ≥4.4.19, and any of 4.2 ≥4.2.19'
+				echo '  see https://jira.mongodb.org/browse/SERVER-71772'
 				echo '  see https://jira.mongodb.org/browse/SERVER-55178'
 				echo '  see also https://en.wikichip.org/wiki/arm/armv8#ARMv8_Extensions_and_Processor_Features'
 				echo '  see also https://github.com/docker-library/mongo/issues/485#issuecomment-970864306'
diff --git a/mongo_4.2-bionic/docker-entrypoint.sh b/mongo_4.2-bionic/docker-entrypoint.sh
index 0073c4f..f24112f 100755
--- a/mongo_4.2-bionic/docker-entrypoint.sh
+++ b/mongo_4.2-bionic/docker-entrypoint.sh
@@ -43,7 +43,9 @@ case "$dpkgArch" in
 		if ! grep -qE '^Features.* (fphp|dcpop|sha3|sm3|sm4|asimddp|sha512|sve)( .*|$)' /proc/cpuinfo; then
 			{
 				echo
-				echo 'WARNING: MongoDB 5.0+ requires ARMv8.2-A or higher, and your current system does not appear to implement any of the common features for that!'
+				echo 'WARNING: MongoDB requires ARMv8.2-A or higher, and your current system does not appear to implement any of the common features for that!'
+				echo '  applies to all versions ≥5.0, any of 4.4 ≥4.4.19, and any of 4.2 ≥4.2.19'
+				echo '  see https://jira.mongodb.org/browse/SERVER-71772'
 				echo '  see https://jira.mongodb.org/browse/SERVER-55178'
 				echo '  see also https://en.wikichip.org/wiki/arm/armv8#ARMv8_Extensions_and_Processor_Features'
 				echo '  see also https://github.com/docker-library/mongo/issues/485#issuecomment-970864306'
diff --git a/mongo_5-focal/docker-entrypoint.sh b/mongo_5-focal/docker-entrypoint.sh
index 0073c4f..f24112f 100755
--- a/mongo_5-focal/docker-entrypoint.sh
+++ b/mongo_5-focal/docker-entrypoint.sh
@@ -43,7 +43,9 @@ case "$dpkgArch" in
 		if ! grep -qE '^Features.* (fphp|dcpop|sha3|sm3|sm4|asimddp|sha512|sve)( .*|$)' /proc/cpuinfo; then
 			{
 				echo
-				echo 'WARNING: MongoDB 5.0+ requires ARMv8.2-A or higher, and your current system does not appear to implement any of the common features for that!'
+				echo 'WARNING: MongoDB requires ARMv8.2-A or higher, and your current system does not appear to implement any of the common features for that!'
+				echo '  applies to all versions ≥5.0, any of 4.4 ≥4.4.19, and any of 4.2 ≥4.2.19'
+				echo '  see https://jira.mongodb.org/browse/SERVER-71772'
 				echo '  see https://jira.mongodb.org/browse/SERVER-55178'
 				echo '  see also https://en.wikichip.org/wiki/arm/armv8#ARMv8_Extensions_and_Processor_Features'
 				echo '  see also https://github.com/docker-library/mongo/issues/485#issuecomment-970864306'
diff --git a/mongo_jammy/docker-entrypoint.sh b/mongo_jammy/docker-entrypoint.sh
index 0073c4f..f24112f 100755
--- a/mongo_jammy/docker-entrypoint.sh
+++ b/mongo_jammy/docker-entrypoint.sh
@@ -43,7 +43,9 @@ case "$dpkgArch" in
 		if ! grep -qE '^Features.* (fphp|dcpop|sha3|sm3|sm4|asimddp|sha512|sve)( .*|$)' /proc/cpuinfo; then
 			{
 				echo
-				echo 'WARNING: MongoDB 5.0+ requires ARMv8.2-A or higher, and your current system does not appear to implement any of the common features for that!'
+				echo 'WARNING: MongoDB requires ARMv8.2-A or higher, and your current system does not appear to implement any of the common features for that!'
+				echo '  applies to all versions ≥5.0, any of 4.4 ≥4.4.19, and any of 4.2 ≥4.2.19'
+				echo '  see https://jira.mongodb.org/browse/SERVER-71772'
 				echo '  see https://jira.mongodb.org/browse/SERVER-55178'
 				echo '  see also https://en.wikichip.org/wiki/arm/armv8#ARMv8_Extensions_and_Processor_Features'
 				echo '  see also https://github.com/docker-library/mongo/issues/485#issuecomment-970864306'

Relevant Maintainers:

@tianon tianon merged commit 1a4c416 into docker-library:master Mar 3, 2023
@tianon tianon deleted the mongo branch March 3, 2023 23:09
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