conditionally set interactive and tty on dokku run.
closes #552 closes #913
This commit is contained in:
@@ -49,7 +49,9 @@ case "$1" in
|
|||||||
shift 2
|
shift 2
|
||||||
|
|
||||||
DOCKER_ARGS=$(: | pluginhook docker-args $APP run)
|
DOCKER_ARGS=$(: | pluginhook docker-args $APP run)
|
||||||
docker run -i -t $DOCKER_ARGS $IMAGE /exec "$@"
|
# if we have a prompt, then we have a tty according to the LDP (http://www.tldp.org/LDP/abs/html/intandnonint.html)
|
||||||
|
[[ ! -z "$PS1" ]] && DOKKU_RUN_OPTS="-i -t"
|
||||||
|
docker run $DOKKU_RUN_OPTS $DOCKER_ARGS $IMAGE /exec "$@"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
url | urls)
|
url | urls)
|
||||||
|
|||||||
@@ -11,6 +11,22 @@ teardown() {
|
|||||||
destroy_app
|
destroy_app
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@test "run (with tty)" {
|
||||||
|
deploy_app
|
||||||
|
run /bin/bash -c "dokku run $TEST_APP ls /app/package.json"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "run (without tty)" {
|
||||||
|
deploy_app
|
||||||
|
run /bin/bash -c ": |dokku run $TEST_APP ls /app/package.json"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
}
|
||||||
|
|
||||||
@test "urls (non-ssl)" {
|
@test "urls (non-ssl)" {
|
||||||
run bash -c "dokku urls $TEST_APP | grep dokku.me"
|
run bash -c "dokku urls $TEST_APP | grep dokku.me"
|
||||||
echo "output: "$output
|
echo "output: "$output
|
||||||
|
|||||||
Reference in New Issue
Block a user