Skip to content

Commit 3282549

Browse files
yosifkityosifkit
authored
Merge pull request #454 from infosiftr/revert-unix
Revert "Force temporary server to use unix socket only"
2 parents 8ff1aa4 + d98dc3a commit 3282549

File tree

5 files changed

+10
-20
lines changed

5 files changed

+10
-20
lines changed

‎3.6/docker-entrypoint.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,9 @@ if [ "$originalArgOne" = 'mongod' ]; then
261261
if _parse_config "$@"; then
262262
_mongod_hack_ensure_arg_val --config "$tempConfigFile" "${mongodHackedArgs[@]}"
263263
fi
264-
_mongod_hack_ensure_arg_val --bind_ip '' "${mongodHackedArgs[@]}"
264+
_mongod_hack_ensure_arg_val --bind_ip 127.0.0.1 "${mongodHackedArgs[@]}"
265265
_mongod_hack_ensure_arg_val --port 27017 "${mongodHackedArgs[@]}"
266-
_mongod_hack_ensure_arg_val --unixSocketPrefix "$TMPDIR" "${mongodHackedArgs[@]}"
267266
_mongod_hack_ensure_no_arg --bind_ip_all "${mongodHackedArgs[@]}"
268-
_mongod_hack_ensure_no_arg --nounixsocket "${mongodHackedArgs[@]}"
269267

270268
# remove "--auth" and "--replSet" for our initial startup (see https://docs.mongodb.com/manual/tutorial/enable-authentication/#start-mongodb-without-access-control)
271269
# https://github.com/docker-library/mongo/issues/211
@@ -305,7 +303,7 @@ if [ "$originalArgOne" = 'mongod' ]; then
305303

306304
"${mongodHackedArgs[@]}" --fork
307305

308-
mongo=( mongo --host "$TMPDIR/mongodb-27017.sock" --quiet )
306+
mongo=( mongo --host 127.0.0.1 --port 27017 --quiet )
309307

310308
# check to see that our "mongod" actually did start up (catches "--help", "--version", MongoDB 3.2 being silly, slow prealloc, etc)
311309
# https://jira.mongodb.org/browse/SERVER-16292

‎4.0/docker-entrypoint.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,9 @@ if [ "$originalArgOne" = 'mongod' ]; then
261261
if _parse_config "$@"; then
262262
_mongod_hack_ensure_arg_val --config "$tempConfigFile" "${mongodHackedArgs[@]}"
263263
fi
264-
_mongod_hack_ensure_arg_val --bind_ip '' "${mongodHackedArgs[@]}"
264+
_mongod_hack_ensure_arg_val --bind_ip 127.0.0.1 "${mongodHackedArgs[@]}"
265265
_mongod_hack_ensure_arg_val --port 27017 "${mongodHackedArgs[@]}"
266-
_mongod_hack_ensure_arg_val --unixSocketPrefix "$TMPDIR" "${mongodHackedArgs[@]}"
267266
_mongod_hack_ensure_no_arg --bind_ip_all "${mongodHackedArgs[@]}"
268-
_mongod_hack_ensure_no_arg --nounixsocket "${mongodHackedArgs[@]}"
269267

270268
# remove "--auth" and "--replSet" for our initial startup (see https://docs.mongodb.com/manual/tutorial/enable-authentication/#start-mongodb-without-access-control)
271269
# https://github.com/docker-library/mongo/issues/211
@@ -305,7 +303,7 @@ if [ "$originalArgOne" = 'mongod' ]; then
305303

306304
"${mongodHackedArgs[@]}" --fork
307305

308-
mongo=( mongo --host "$TMPDIR/mongodb-27017.sock" --quiet )
306+
mongo=( mongo --host 127.0.0.1 --port 27017 --quiet )
309307

310308
# check to see that our "mongod" actually did start up (catches "--help", "--version", MongoDB 3.2 being silly, slow prealloc, etc)
311309
# https://jira.mongodb.org/browse/SERVER-16292

‎4.2/docker-entrypoint.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,9 @@ if [ "$originalArgOne" = 'mongod' ]; then
261261
if _parse_config "$@"; then
262262
_mongod_hack_ensure_arg_val --config "$tempConfigFile" "${mongodHackedArgs[@]}"
263263
fi
264-
_mongod_hack_ensure_arg_val --bind_ip '' "${mongodHackedArgs[@]}"
264+
_mongod_hack_ensure_arg_val --bind_ip 127.0.0.1 "${mongodHackedArgs[@]}"
265265
_mongod_hack_ensure_arg_val --port 27017 "${mongodHackedArgs[@]}"
266-
_mongod_hack_ensure_arg_val --unixSocketPrefix "$TMPDIR" "${mongodHackedArgs[@]}"
267266
_mongod_hack_ensure_no_arg --bind_ip_all "${mongodHackedArgs[@]}"
268-
_mongod_hack_ensure_no_arg --nounixsocket "${mongodHackedArgs[@]}"
269267

270268
# remove "--auth" and "--replSet" for our initial startup (see https://docs.mongodb.com/manual/tutorial/enable-authentication/#start-mongodb-without-access-control)
271269
# https://github.com/docker-library/mongo/issues/211
@@ -305,7 +303,7 @@ if [ "$originalArgOne" = 'mongod' ]; then
305303

306304
"${mongodHackedArgs[@]}" --fork
307305

308-
mongo=( mongo --host "$TMPDIR/mongodb-27017.sock" --quiet )
306+
mongo=( mongo --host 127.0.0.1 --port 27017 --quiet )
309307

310308
# check to see that our "mongod" actually did start up (catches "--help", "--version", MongoDB 3.2 being silly, slow prealloc, etc)
311309
# https://jira.mongodb.org/browse/SERVER-16292

‎4.4/docker-entrypoint.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,9 @@ if [ "$originalArgOne" = 'mongod' ]; then
261261
if _parse_config "$@"; then
262262
_mongod_hack_ensure_arg_val --config "$tempConfigFile" "${mongodHackedArgs[@]}"
263263
fi
264-
_mongod_hack_ensure_arg_val --bind_ip '' "${mongodHackedArgs[@]}"
264+
_mongod_hack_ensure_arg_val --bind_ip 127.0.0.1 "${mongodHackedArgs[@]}"
265265
_mongod_hack_ensure_arg_val --port 27017 "${mongodHackedArgs[@]}"
266-
_mongod_hack_ensure_arg_val --unixSocketPrefix "$TMPDIR" "${mongodHackedArgs[@]}"
267266
_mongod_hack_ensure_no_arg --bind_ip_all "${mongodHackedArgs[@]}"
268-
_mongod_hack_ensure_no_arg --nounixsocket "${mongodHackedArgs[@]}"
269267

270268
# remove "--auth" and "--replSet" for our initial startup (see https://docs.mongodb.com/manual/tutorial/enable-authentication/#start-mongodb-without-access-control)
271269
# https://github.com/docker-library/mongo/issues/211
@@ -305,7 +303,7 @@ if [ "$originalArgOne" = 'mongod' ]; then
305303

306304
"${mongodHackedArgs[@]}" --fork
307305

308-
mongo=( mongo --host "$TMPDIR/mongodb-27017.sock" --quiet )
306+
mongo=( mongo --host 127.0.0.1 --port 27017 --quiet )
309307

310308
# check to see that our "mongod" actually did start up (catches "--help", "--version", MongoDB 3.2 being silly, slow prealloc, etc)
311309
# https://jira.mongodb.org/browse/SERVER-16292

‎docker-entrypoint.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,9 @@ if [ "$originalArgOne" = 'mongod' ]; then
261261
if _parse_config "$@"; then
262262
_mongod_hack_ensure_arg_val --config "$tempConfigFile" "${mongodHackedArgs[@]}"
263263
fi
264-
_mongod_hack_ensure_arg_val --bind_ip '' "${mongodHackedArgs[@]}"
264+
_mongod_hack_ensure_arg_val --bind_ip 127.0.0.1 "${mongodHackedArgs[@]}"
265265
_mongod_hack_ensure_arg_val --port 27017 "${mongodHackedArgs[@]}"
266-
_mongod_hack_ensure_arg_val --unixSocketPrefix "$TMPDIR" "${mongodHackedArgs[@]}"
267266
_mongod_hack_ensure_no_arg --bind_ip_all "${mongodHackedArgs[@]}"
268-
_mongod_hack_ensure_no_arg --nounixsocket "${mongodHackedArgs[@]}"
269267

270268
# remove "--auth" and "--replSet" for our initial startup (see https://docs.mongodb.com/manual/tutorial/enable-authentication/#start-mongodb-without-access-control)
271269
# https://github.com/docker-library/mongo/issues/211
@@ -305,7 +303,7 @@ if [ "$originalArgOne" = 'mongod' ]; then
305303

306304
"${mongodHackedArgs[@]}" --fork
307305

308-
mongo=( mongo --host "$TMPDIR/mongodb-27017.sock" --quiet )
306+
mongo=( mongo --host 127.0.0.1 --port 27017 --quiet )
309307

310308
# check to see that our "mongod" actually did start up (catches "--help", "--version", MongoDB 3.2 being silly, slow prealloc, etc)
311309
# https://jira.mongodb.org/browse/SERVER-16292

0 commit comments

Comments
 (0)