Update mongo #10667
Merged
Update mongo #10667
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@43286fc: Merge pull request docker-library/mongo#491 from infosiftr/avx-warning - docker-library/mongo@c1f08e8: Add a warning for non-AVX (amd64) systems
Diff for 181a08a:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 281e047..fea841a 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -25,13 +25,13 @@ Constraints: windowsservercore-ltsc2016
Tags: 4.0.26-xenial, 4.0-xenial
SharedTags: 4.0.26, 4.0
Architectures: amd64, arm64v8
-GitCommit: faee02920b450a4a66bddec8ce67f48f802cd012
+GitCommit: c1f08e81d162ff5710181c5072402e809d0fdd5e
Directory: 4.0
Tags: 4.2.15-bionic, 4.2-bionic
SharedTags: 4.2.15, 4.2
Architectures: amd64, arm64v8
-GitCommit: 71291370ed14fcec09a2f8da8edd6d24062516c9
+GitCommit: c1f08e81d162ff5710181c5072402e809d0fdd5e
Directory: 4.2
Tags: 4.2.15-nanoserver-1809, 4.2-nanoserver-1809
@@ -58,7 +58,7 @@ Constraints: windowsservercore-ltsc2016
Tags: 4.4.7-focal, 4.4-focal, 4-focal
SharedTags: 4.4.7, 4.4, 4
Architectures: amd64, arm64v8
-GitCommit: babc077da86d7ab12a225300feb71fa3b309b1da
+GitCommit: c1f08e81d162ff5710181c5072402e809d0fdd5e
Directory: 4.4
Tags: 4.4.7-nanoserver-1809, 4.4-nanoserver-1809, 4-nanoserver-1809
@@ -85,7 +85,7 @@ Constraints: windowsservercore-ltsc2016
Tags: 4.4.8-rc0-focal, 4.4-rc-focal
SharedTags: 4.4.8-rc0, 4.4-rc
Architectures: amd64, arm64v8
-GitCommit: c0c7aa34cbc3965f2ee2597ecd9a75d82e98558f
+GitCommit: c1f08e81d162ff5710181c5072402e809d0fdd5e
Directory: 4.4-rc
Tags: 4.4.8-rc0-nanoserver-1809, 4.4-rc-nanoserver-1809
@@ -112,7 +112,7 @@ Constraints: windowsservercore-ltsc2016
Tags: 5.0.1-focal, 5.0-focal, 5-focal, focal
SharedTags: 5.0.1, 5.0, 5, latest
Architectures: amd64, arm64v8
-GitCommit: d1a59c1610746d2cd8ed79a6b64df41f06182e18
+GitCommit: c1f08e81d162ff5710181c5072402e809d0fdd5e
Directory: 5.0
Tags: 5.0.1-nanoserver-1809, 5.0-nanoserver-1809, 5-nanoserver-1809, nanoserver-1809
diff --git a/mongo_4-focal/docker-entrypoint.sh b/mongo_4-focal/docker-entrypoint.sh
index 7b8b333..e00e3c8 100755
--- a/mongo_4-focal/docker-entrypoint.sh
+++ b/mongo_4-focal/docker-entrypoint.sh
@@ -22,6 +22,17 @@ if [[ "$originalArgOne" == mongo* ]] && [ "$(id -u)" = '0' ]; then
exec gosu mongodb "$BASH_SOURCE" "$@"
fi
+if dpkgArch="$(dpkg --print-architecture)" && [ "$dpkgArch" = 'amd64' ] && ! grep -qE '^flags.* avx( .*|$)' /proc/cpuinfo; then
+ # https://github.com/docker-library/mongo/issues/485#issuecomment-891991814
+ {
+ echo
+ echo 'WARNING: MongoDB 5.0+ requires a CPU with AVX support, and your current system does not appear to have that!'
+ echo ' see https://www.mongodb.com/community/forums/t/mongodb-5-0-cpu-intel-g4650-compatibility/116610/2'
+ echo ' see also https://github.com/docker-library/mongo/issues/485#issuecomment-891991814'
+ echo
+ } >&2
+fi
+
# you should use numactl to start your mongod instances, including the config servers, mongos instances, and any clients.
# https://docs.mongodb.com/manual/administration/production-notes/#configuring-numa-on-linux
if [[ "$originalArgOne" == mongo* ]]; then
diff --git a/mongo_4.0-xenial/docker-entrypoint.sh b/mongo_4.0-xenial/docker-entrypoint.sh
index 7b8b333..e00e3c8 100755
--- a/mongo_4.0-xenial/docker-entrypoint.sh
+++ b/mongo_4.0-xenial/docker-entrypoint.sh
@@ -22,6 +22,17 @@ if [[ "$originalArgOne" == mongo* ]] && [ "$(id -u)" = '0' ]; then
exec gosu mongodb "$BASH_SOURCE" "$@"
fi
+if dpkgArch="$(dpkg --print-architecture)" && [ "$dpkgArch" = 'amd64' ] && ! grep -qE '^flags.* avx( .*|$)' /proc/cpuinfo; then
+ # https://github.com/docker-library/mongo/issues/485#issuecomment-891991814
+ {
+ echo
+ echo 'WARNING: MongoDB 5.0+ requires a CPU with AVX support, and your current system does not appear to have that!'
+ echo ' see https://www.mongodb.com/community/forums/t/mongodb-5-0-cpu-intel-g4650-compatibility/116610/2'
+ echo ' see also https://github.com/docker-library/mongo/issues/485#issuecomment-891991814'
+ echo
+ } >&2
+fi
+
# you should use numactl to start your mongod instances, including the config servers, mongos instances, and any clients.
# https://docs.mongodb.com/manual/administration/production-notes/#configuring-numa-on-linux
if [[ "$originalArgOne" == mongo* ]]; then
diff --git a/mongo_4.2-bionic/docker-entrypoint.sh b/mongo_4.2-bionic/docker-entrypoint.sh
index 7b8b333..e00e3c8 100755
--- a/mongo_4.2-bionic/docker-entrypoint.sh
+++ b/mongo_4.2-bionic/docker-entrypoint.sh
@@ -22,6 +22,17 @@ if [[ "$originalArgOne" == mongo* ]] && [ "$(id -u)" = '0' ]; then
exec gosu mongodb "$BASH_SOURCE" "$@"
fi
+if dpkgArch="$(dpkg --print-architecture)" && [ "$dpkgArch" = 'amd64' ] && ! grep -qE '^flags.* avx( .*|$)' /proc/cpuinfo; then
+ # https://github.com/docker-library/mongo/issues/485#issuecomment-891991814
+ {
+ echo
+ echo 'WARNING: MongoDB 5.0+ requires a CPU with AVX support, and your current system does not appear to have that!'
+ echo ' see https://www.mongodb.com/community/forums/t/mongodb-5-0-cpu-intel-g4650-compatibility/116610/2'
+ echo ' see also https://github.com/docker-library/mongo/issues/485#issuecomment-891991814'
+ echo
+ } >&2
+fi
+
# you should use numactl to start your mongod instances, including the config servers, mongos instances, and any clients.
# https://docs.mongodb.com/manual/administration/production-notes/#configuring-numa-on-linux
if [[ "$originalArgOne" == mongo* ]]; then
diff --git a/mongo_4.4-rc-focal/docker-entrypoint.sh b/mongo_4.4-rc-focal/docker-entrypoint.sh
index 7b8b333..e00e3c8 100755
--- a/mongo_4.4-rc-focal/docker-entrypoint.sh
+++ b/mongo_4.4-rc-focal/docker-entrypoint.sh
@@ -22,6 +22,17 @@ if [[ "$originalArgOne" == mongo* ]] && [ "$(id -u)" = '0' ]; then
exec gosu mongodb "$BASH_SOURCE" "$@"
fi
+if dpkgArch="$(dpkg --print-architecture)" && [ "$dpkgArch" = 'amd64' ] && ! grep -qE '^flags.* avx( .*|$)' /proc/cpuinfo; then
+ # https://github.com/docker-library/mongo/issues/485#issuecomment-891991814
+ {
+ echo
+ echo 'WARNING: MongoDB 5.0+ requires a CPU with AVX support, and your current system does not appear to have that!'
+ echo ' see https://www.mongodb.com/community/forums/t/mongodb-5-0-cpu-intel-g4650-compatibility/116610/2'
+ echo ' see also https://github.com/docker-library/mongo/issues/485#issuecomment-891991814'
+ echo
+ } >&2
+fi
+
# you should use numactl to start your mongod instances, including the config servers, mongos instances, and any clients.
# https://docs.mongodb.com/manual/administration/production-notes/#configuring-numa-on-linux
if [[ "$originalArgOne" == mongo* ]]; then
diff --git a/mongo_focal/docker-entrypoint.sh b/mongo_focal/docker-entrypoint.sh
index 7b8b333..e00e3c8 100755
--- a/mongo_focal/docker-entrypoint.sh
+++ b/mongo_focal/docker-entrypoint.sh
@@ -22,6 +22,17 @@ if [[ "$originalArgOne" == mongo* ]] && [ "$(id -u)" = '0' ]; then
exec gosu mongodb "$BASH_SOURCE" "$@"
fi
+if dpkgArch="$(dpkg --print-architecture)" && [ "$dpkgArch" = 'amd64' ] && ! grep -qE '^flags.* avx( .*|$)' /proc/cpuinfo; then
+ # https://github.com/docker-library/mongo/issues/485#issuecomment-891991814
+ {
+ echo
+ echo 'WARNING: MongoDB 5.0+ requires a CPU with AVX support, and your current system does not appear to have that!'
+ echo ' see https://www.mongodb.com/community/forums/t/mongodb-5-0-cpu-intel-g4650-compatibility/116610/2'
+ echo ' see also https://github.com/docker-library/mongo/issues/485#issuecomment-891991814'
+ echo
+ } >&2
+fi
+
# you should use numactl to start your mongod instances, including the config servers, mongos instances, and any clients.
# https://docs.mongodb.com/manual/administration/production-notes/#configuring-numa-on-linux
if [[ "$originalArgOne" == mongo* ]]; then
|
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: