Skip to content

Revert "Force temporary server to use unix socket only" #454

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.

Sign up for GitHub

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

Revert "Force temporary server to use unix socket only" #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions 3.6/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions 4.0/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions 4.2/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions 4.4/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down