From 5cced02b01e8dd9a12d51cdb40a3e1fd8427f5b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Guitaut?= Date: Mon, 21 Sep 2015 10:15:00 +0200 Subject: [PATCH] Do not always allocate a tty on `connect` --- commands | 5 +++-- tests/service_connect.bats | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/commands b/commands index 691899f..9d3f7d9 100755 --- a/commands +++ b/commands @@ -169,9 +169,10 @@ case "$1" in verify_service_name "$2" SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" SERVICE_NAME="$(get_service_name "$SERVICE")" - PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD") - docker exec -it "$SERVICE_NAME" mysql --user=mysql --password="$PASSWORD" --database="$SERVICE" + has_tty && SERVICE_TTY_OPTS="-t" + + docker exec -i $SERVICE_TTY_OPTS "$SERVICE_NAME" mysql --user=mysql --password="$PASSWORD" --database="$SERVICE" ;; $PLUGIN_COMMAND_PREFIX:info) diff --git a/tests/service_connect.bats b/tests/service_connect.bats index d57f5b1..cd931a4 100755 --- a/tests/service_connect.bats +++ b/tests/service_connect.bats @@ -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.mysql.l mysql --user=mysql --password=$password --database=l" + assert_output "docker exec -i -t dokku.mysql.l mysql --user=mysql --password=$password --database=l" }