-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Update mongo #9428
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
Merged
Merged
Update mongo #9428
Conversation
This file contains hidden or 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@3282549: Merge pull request docker-library/mongo#454 from infosiftr/revert-unix - docker-library/mongo@d98dc3a: Revert "Force temporary server to use unix socket only"
Diff for 5eb88a0:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7cb8eb3..6b7705c 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -18,7 +18,7 @@ Constraints: windowsservercore-ltsc2016
Tags: 3.6.21-xenial, 3.6-xenial, 3-xenial
SharedTags: 3.6.21, 3.6, 3
Architectures: amd64, arm64v8
-GitCommit: 8ff1aa44aa68b0b044dc7be7da7c76f712f00e07
+GitCommit: d98dc3a1e7f217ac0294db4e6ed4c3f667a1b579
Directory: 3.6
Tags: 4.0.22-windowsservercore-1809, 4.0-windowsservercore-1809
@@ -38,13 +38,13 @@ Constraints: windowsservercore-ltsc2016
Tags: 4.0.22-xenial, 4.0-xenial
SharedTags: 4.0.22, 4.0
Architectures: amd64, arm64v8
-GitCommit: 8ff1aa44aa68b0b044dc7be7da7c76f712f00e07
+GitCommit: d98dc3a1e7f217ac0294db4e6ed4c3f667a1b579
Directory: 4.0
Tags: 4.2.11-bionic, 4.2-bionic
SharedTags: 4.2.11, 4.2
Architectures: amd64, arm64v8
-GitCommit: 8ff1aa44aa68b0b044dc7be7da7c76f712f00e07
+GitCommit: d98dc3a1e7f217ac0294db4e6ed4c3f667a1b579
Directory: 4.2
Tags: 4.2.11-windowsservercore-1809, 4.2-windowsservercore-1809
@@ -64,7 +64,7 @@ Constraints: windowsservercore-ltsc2016
Tags: 4.4.3-bionic, 4.4-bionic, 4-bionic, bionic
SharedTags: 4.4.3, 4.4, 4, latest
Architectures: amd64, arm64v8, s390x
-GitCommit: 8ff1aa44aa68b0b044dc7be7da7c76f712f00e07
+GitCommit: d98dc3a1e7f217ac0294db4e6ed4c3f667a1b579
Directory: 4.4
Tags: 4.4.3-windowsservercore-1809, 4.4-windowsservercore-1809, 4-windowsservercore-1809, windowsservercore-1809
diff --git a/mongo_3-xenial/docker-entrypoint.sh b/mongo_3-xenial/docker-entrypoint.sh
index 050aa98..181a2e9 100755
--- a/mongo_3-xenial/docker-entrypoint.sh
+++ b/mongo_3-xenial/docker-entrypoint.sh
@@ -261,11 +261,9 @@ if [ "$originalArgOne" = 'mongod' ]; then
if _parse_config "$@"; then
_mongod_hack_ensure_arg_val --config "$tempConfigFile" "${mongodHackedArgs[@]}"
fi
- _mongod_hack_ensure_arg_val --bind_ip '' "${mongodHackedArgs[@]}"
+ _mongod_hack_ensure_arg_val --bind_ip 127.0.0.1 "${mongodHackedArgs[@]}"
_mongod_hack_ensure_arg_val --port 27017 "${mongodHackedArgs[@]}"
- _mongod_hack_ensure_arg_val --unixSocketPrefix "$TMPDIR" "${mongodHackedArgs[@]}"
_mongod_hack_ensure_no_arg --bind_ip_all "${mongodHackedArgs[@]}"
- _mongod_hack_ensure_no_arg --nounixsocket "${mongodHackedArgs[@]}"
# remove "--auth" and "--replSet" for our initial startup (see https://docs.mongodb.com/manual/tutorial/enable-authentication/#start-mongodb-without-access-control)
# https://github.com/docker-library/mongo/issues/211
@@ -305,7 +303,7 @@ if [ "$originalArgOne" = 'mongod' ]; then
"${mongodHackedArgs[@]}" --fork
- mongo=( mongo --host "$TMPDIR/mongodb-27017.sock" --quiet )
+ mongo=( mongo --host 127.0.0.1 --port 27017 --quiet )
# check to see that our "mongod" actually did start up (catches "--help", "--version", MongoDB 3.2 being silly, slow prealloc, etc)
# https://jira.mongodb.org/browse/SERVER-16292
diff --git a/mongo_4.0-xenial/docker-entrypoint.sh b/mongo_4.0-xenial/docker-entrypoint.sh
index 050aa98..181a2e9 100755
--- a/mongo_4.0-xenial/docker-entrypoint.sh
+++ b/mongo_4.0-xenial/docker-entrypoint.sh
@@ -261,11 +261,9 @@ if [ "$originalArgOne" = 'mongod' ]; then
if _parse_config "$@"; then
_mongod_hack_ensure_arg_val --config "$tempConfigFile" "${mongodHackedArgs[@]}"
fi
- _mongod_hack_ensure_arg_val --bind_ip '' "${mongodHackedArgs[@]}"
+ _mongod_hack_ensure_arg_val --bind_ip 127.0.0.1 "${mongodHackedArgs[@]}"
_mongod_hack_ensure_arg_val --port 27017 "${mongodHackedArgs[@]}"
- _mongod_hack_ensure_arg_val --unixSocketPrefix "$TMPDIR" "${mongodHackedArgs[@]}"
_mongod_hack_ensure_no_arg --bind_ip_all "${mongodHackedArgs[@]}"
- _mongod_hack_ensure_no_arg --nounixsocket "${mongodHackedArgs[@]}"
# remove "--auth" and "--replSet" for our initial startup (see https://docs.mongodb.com/manual/tutorial/enable-authentication/#start-mongodb-without-access-control)
# https://github.com/docker-library/mongo/issues/211
@@ -305,7 +303,7 @@ if [ "$originalArgOne" = 'mongod' ]; then
"${mongodHackedArgs[@]}" --fork
- mongo=( mongo --host "$TMPDIR/mongodb-27017.sock" --quiet )
+ mongo=( mongo --host 127.0.0.1 --port 27017 --quiet )
# check to see that our "mongod" actually did start up (catches "--help", "--version", MongoDB 3.2 being silly, slow prealloc, etc)
# https://jira.mongodb.org/browse/SERVER-16292
diff --git a/mongo_4.2-bionic/docker-entrypoint.sh b/mongo_4.2-bionic/docker-entrypoint.sh
index 050aa98..181a2e9 100755
--- a/mongo_4.2-bionic/docker-entrypoint.sh
+++ b/mongo_4.2-bionic/docker-entrypoint.sh
@@ -261,11 +261,9 @@ if [ "$originalArgOne" = 'mongod' ]; then
if _parse_config "$@"; then
_mongod_hack_ensure_arg_val --config "$tempConfigFile" "${mongodHackedArgs[@]}"
fi
- _mongod_hack_ensure_arg_val --bind_ip '' "${mongodHackedArgs[@]}"
+ _mongod_hack_ensure_arg_val --bind_ip 127.0.0.1 "${mongodHackedArgs[@]}"
_mongod_hack_ensure_arg_val --port 27017 "${mongodHackedArgs[@]}"
- _mongod_hack_ensure_arg_val --unixSocketPrefix "$TMPDIR" "${mongodHackedArgs[@]}"
_mongod_hack_ensure_no_arg --bind_ip_all "${mongodHackedArgs[@]}"
- _mongod_hack_ensure_no_arg --nounixsocket "${mongodHackedArgs[@]}"
# remove "--auth" and "--replSet" for our initial startup (see https://docs.mongodb.com/manual/tutorial/enable-authentication/#start-mongodb-without-access-control)
# https://github.com/docker-library/mongo/issues/211
@@ -305,7 +303,7 @@ if [ "$originalArgOne" = 'mongod' ]; then
"${mongodHackedArgs[@]}" --fork
- mongo=( mongo --host "$TMPDIR/mongodb-27017.sock" --quiet )
+ mongo=( mongo --host 127.0.0.1 --port 27017 --quiet )
# check to see that our "mongod" actually did start up (catches "--help", "--version", MongoDB 3.2 being silly, slow prealloc, etc)
# https://jira.mongodb.org/browse/SERVER-16292
diff --git a/mongo_bionic/docker-entrypoint.sh b/mongo_bionic/docker-entrypoint.sh
index 050aa98..181a2e9 100755
--- a/mongo_bionic/docker-entrypoint.sh
+++ b/mongo_bionic/docker-entrypoint.sh
@@ -261,11 +261,9 @@ if [ "$originalArgOne" = 'mongod' ]; then
if _parse_config "$@"; then
_mongod_hack_ensure_arg_val --config "$tempConfigFile" "${mongodHackedArgs[@]}"
fi
- _mongod_hack_ensure_arg_val --bind_ip '' "${mongodHackedArgs[@]}"
+ _mongod_hack_ensure_arg_val --bind_ip 127.0.0.1 "${mongodHackedArgs[@]}"
_mongod_hack_ensure_arg_val --port 27017 "${mongodHackedArgs[@]}"
- _mongod_hack_ensure_arg_val --unixSocketPrefix "$TMPDIR" "${mongodHackedArgs[@]}"
_mongod_hack_ensure_no_arg --bind_ip_all "${mongodHackedArgs[@]}"
- _mongod_hack_ensure_no_arg --nounixsocket "${mongodHackedArgs[@]}"
# remove "--auth" and "--replSet" for our initial startup (see https://docs.mongodb.com/manual/tutorial/enable-authentication/#start-mongodb-without-access-control)
# https://github.com/docker-library/mongo/issues/211
@@ -305,7 +303,7 @@ if [ "$originalArgOne" = 'mongod' ]; then
"${mongodHackedArgs[@]}" --fork
- mongo=( mongo --host "$TMPDIR/mongodb-27017.sock" --quiet )
+ mongo=( mongo --host 127.0.0.1 --port 27017 --quiet )
# check to see that our "mongod" actually did start up (catches "--help", "--version", MongoDB 3.2 being silly, slow prealloc, etc)
# https://jira.mongodb.org/browse/SERVER-16292
|
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: