dokku/dokku-mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18 from dokku/lg-tty-on-connect

Browse Source 
Do not always allocate a tty on `connect`
This commit is contained in:
Jose Diaz-Gonzalez
2015-09-21 10:12:36 -04:00
parent b26a612a50 22fa6bd92d
commit eab5ec1b14
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
commands
View File

@@ -166,8 +166,9 @@ case "$1" in
SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
SERVICE_NAME="$(get_service_name "$SERVICE")"
PASSWORD="$(cat "$SERVICE_ROOT/PASSWORD")"
has_tty && SERVICE_TTY_OPTS="-t"
docker exec -it "$SERVICE_NAME" mongo -u "$SERVICE" -p "$PASSWORD" --authenticationDatabase "$SERVICE" "$SERVICE"
docker exec -i $SERVICE_TTY_OPTS "$SERVICE_NAME" mongo -u "$SERVICE" -p "$PASSWORD" --authenticationDatabase "$SERVICE" "$SERVICE"
;;
$PLUGIN_COMMAND_PREFIX:info)

2
tests/service_connect.bats
View File

@@ -25,6 +25,6 @@ teardown() {
export ECHO_DOCKER_COMMAND="true"
run dokku "$PLUGIN_COMMAND_PREFIX:connect" l
password="$(cat "$PLUGIN_DATA_ROOT/l/PASSWORD")"
assert_output "docker exec -it dokku.mongo.l mongo -u l -p $password --authenticationDatabase l l"
assert_output "docker exec -i -t dokku.mongo.l mongo -u l -p $password --authenticationDatabase l l"
}