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

Do not always allocate a tty on connect

Browse Source
This commit is contained in:
Loïc Guitaut
2015-09-21 10:15:00 +02:00
parent ec3aa1fe0f
commit 5cced02b01
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
commands
View File

@@ -169,9 +169,10 @@ case "$1" in
verify_service_name "$2" verify_service_name "$2"
SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
SERVICE_NAME="$(get_service_name "$SERVICE")" SERVICE_NAME="$(get_service_name "$SERVICE")"
PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD") 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) $PLUGIN_COMMAND_PREFIX:info)

2
tests/service_connect.bats
View File

@@ -25,6 +25,6 @@ teardown() {
export ECHO_DOCKER_COMMAND="true" export ECHO_DOCKER_COMMAND="true"
run dokku "$PLUGIN_COMMAND_PREFIX:connect" l run dokku "$PLUGIN_COMMAND_PREFIX:connect" l
password="$(cat "$PLUGIN_DATA_ROOT/l/PASSWORD")" 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"
} }