allow docker-options over ssh. plus test. closes #1135
This commit is contained in:
2
dokku
2
dokku
@@ -37,7 +37,7 @@ fi
|
|||||||
|
|
||||||
if [[ -n "$SSH_ORIGINAL_COMMAND" ]]; then
|
if [[ -n "$SSH_ORIGINAL_COMMAND" ]]; then
|
||||||
export -n SSH_ORIGINAL_COMMAND
|
export -n SSH_ORIGINAL_COMMAND
|
||||||
if [[ $1 =~ config-* ]];then
|
if [[ $1 =~ config-* ]] || [[ $1 =~ docker-options* ]];then
|
||||||
xargs $0 <<<$SSH_ORIGINAL_COMMAND
|
xargs $0 <<<$SSH_ORIGINAL_COMMAND
|
||||||
exit $?
|
exit $?
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -149,3 +149,14 @@ teardown() {
|
|||||||
assert_success
|
assert_success
|
||||||
deploy_app
|
deploy_app
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@test "docker-options:add (all phases over SSH)" {
|
||||||
|
run ssh dokku@dokku.me docker-options:add $TEST_APP build,deploy,run \"-v /tmp\"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
run /bin/bash -c "dokku docker-options $TEST_APP | egrep '\-v /tmp' | wc -l | grep -q 3"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user