Skip to content

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 1 commit into from
Jan 14, 2021
Merged

Update mongo #9428

merged 1 commit into from
Jan 14, 2021

Conversation

tianon
Copy link
Member

@tianon tianon commented Jan 14, 2021

Changes:

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"
@github-actions
Copy link

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

@yosifkit yosifkit merged commit 1ee3cd1 into docker-library:master Jan 14, 2021
@yosifkit yosifkit deleted the mongo branch January 14, 2021 18:54
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