Merge pull request #43 from ebeigarts/export-fix
Fix exit code for mysql:export when SSH_TTY is not present
This commit is contained in:
2
commands
2
commands
@@ -124,7 +124,9 @@ case "$1" in
|
|||||||
|
|
||||||
[[ -n $SSH_TTY ]] && stty -opost
|
[[ -n $SSH_TTY ]] && stty -opost
|
||||||
docker exec "$SERVICE_NAME" mysqldump --user=mysql --password="$PASSWORD" "$SERVICE"
|
docker exec "$SERVICE_NAME" mysqldump --user=mysql --password="$PASSWORD" "$SERVICE"
|
||||||
|
status=$?
|
||||||
[[ -n $SSH_TTY ]] && stty opost
|
[[ -n $SSH_TTY ]] && stty opost
|
||||||
|
exit $status
|
||||||
;;
|
;;
|
||||||
|
|
||||||
$PLUGIN_COMMAND_PREFIX:import)
|
$PLUGIN_COMMAND_PREFIX:import)
|
||||||
|
|||||||
@@ -21,10 +21,20 @@ teardown() {
|
|||||||
assert_contains "${lines[*]}" "service not_existing_service does not exist"
|
assert_contains "${lines[*]}" "service not_existing_service does not exist"
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "($PLUGIN_COMMAND_PREFIX:export) success" {
|
@test "($PLUGIN_COMMAND_PREFIX:export) success with SSH_TTY" {
|
||||||
export ECHO_DOCKER_COMMAND="true"
|
export ECHO_DOCKER_COMMAND="true"
|
||||||
|
export SSH_TTY=`tty`
|
||||||
run dokku "$PLUGIN_COMMAND_PREFIX:export" l
|
run dokku "$PLUGIN_COMMAND_PREFIX:export" l
|
||||||
password="$(cat "$PLUGIN_DATA_ROOT/l/PASSWORD")"
|
password="$(cat "$PLUGIN_DATA_ROOT/l/PASSWORD")"
|
||||||
|
assert_exit_status 0
|
||||||
assert_output "docker exec dokku.mysql.l mysqldump --user=mysql --password=$password l"
|
assert_output "docker exec dokku.mysql.l mysqldump --user=mysql --password=$password l"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@test "($PLUGIN_COMMAND_PREFIX:export) success without SSH_TTY" {
|
||||||
|
export ECHO_DOCKER_COMMAND="true"
|
||||||
|
unset SSH_TTY
|
||||||
|
run dokku "$PLUGIN_COMMAND_PREFIX:export" l
|
||||||
|
password="$(cat "$PLUGIN_DATA_ROOT/l/PASSWORD")"
|
||||||
|
assert_exit_status 0
|
||||||
|
assert_output "docker exec dokku.mysql.l mysqldump --user=mysql --password=$password l"
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user