Merge pull request #1193 from progrium/1187_mh-docker-opts-over-ssh

handle docker opts over ssh without escaping quotes. closes #1187
This commit is contained in:
Michael Hobbs committed 2015-05-18 12:16:08 -07:00
commit c5a74fac90
2 files changed
+5 -3

No files matched your search

+4 -2
View File
@@ -81,7 +81,8 @@ get_passed_docker_option() {
add_passed_docker_option() { add_passed_docker_option() {
local passed_phases=("${!1}") local passed_phases=("${!1}")
local passed_option_string=$2 shift
local passed_option_string="$*"
local phase local phase
for phase in "${passed_phases[@]}"; do for phase in "${passed_phases[@]}"; do
get_phase_file_path $phase get_phase_file_path $phase
@@ -94,7 +95,8 @@ add_passed_docker_option() {
remove_passed_docker_option() { remove_passed_docker_option() {
local passed_phases=("${!1}") local passed_phases=("${!1}")
local passed_option_string=$2 shift
local passed_option_string="$*"
local phase local phase
for phase in "${passed_phases[@]}"; do for phase in "${passed_phases[@]}"; do
get_phase_file_path $phase get_phase_file_path $phase
+1 -1
View File
@@ -151,7 +151,7 @@ teardown() {
} }
@test "docker-options:add (all phases over SSH)" { @test "docker-options:add (all phases over SSH)" {
run ssh dokku@dokku.me docker-options:add $TEST_APP build,deploy,run \"-v /tmp\" run ssh dokku@dokku.me docker-options:add $TEST_APP build,deploy,run "-v /tmp"
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success