refactor: wrap all 'run dokku' calls in /bin/bash calls
This commit is contained in:
commit
3656651cb9
27 files changed
+314
-315
No files matched your search
@@ -17,7 +17,7 @@ teardown() {
|
||||
# # looks like docker exec is built to work with docker-under-libcontainer,
|
||||
# # but we're using docker-under-lxc. I don't have an estimated time for the fix, sorry
|
||||
# skip "circleci does not support docker exec at the moment."
|
||||
# run bash -c "dokku ps $TEST_APP | grep -q \"node web.js\""
|
||||
# run /bin/bash -c "dokku ps $TEST_APP | grep -q \"node web.js\""
|
||||
# echo "output: "$output
|
||||
# echo "status: "$status
|
||||
# assert_success
|
||||
@@ -25,45 +25,45 @@ teardown() {
|
||||
|
||||
@test "(ps) dockerfile" {
|
||||
deploy_app dockerfile
|
||||
run bash -c "dokku ps:stop $TEST_APP"
|
||||
run /bin/bash -c "dokku ps:stop $TEST_APP"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
|
||||
run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
|
||||
run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_failure
|
||||
done
|
||||
|
||||
run bash -c "dokku ps:start $TEST_APP"
|
||||
run /bin/bash -c "dokku ps:start $TEST_APP"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
|
||||
run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
|
||||
run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
done
|
||||
|
||||
run bash -c "dokku ps:restart $TEST_APP"
|
||||
run /bin/bash -c "dokku ps:restart $TEST_APP"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
|
||||
run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
|
||||
run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
done
|
||||
|
||||
run bash -c "dokku ps:rebuild $TEST_APP"
|
||||
run /bin/bash -c "dokku ps:rebuild $TEST_APP"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
|
||||
run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
|
||||
run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
@@ -71,7 +71,7 @@ teardown() {
|
||||
}
|
||||
|
||||
@test "(ps:scale) dockerfile non-existent process" {
|
||||
run bash -c "dokku ps:scale $TEST_APP non-existent=2"
|
||||
run /bin/bash -c "dokku ps:scale $TEST_APP non-existent=2"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_success
|
||||
@@ -79,14 +79,14 @@ teardown() {
|
||||
destroy_app
|
||||
create_app
|
||||
deploy_app dockerfile-procfile
|
||||
run bash -c "dokku ps:scale $TEST_APP non-existent=2"
|
||||
run /bin/bash -c "dokku ps:scale $TEST_APP non-existent=2"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_failure
|
||||
}
|
||||
|
||||
@test "(ps:scale) dockerfile" {
|
||||
run bash -c "dokku ps:scale $TEST_APP web=2"
|
||||
run /bin/bash -c "dokku ps:scale $TEST_APP web=2"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
@@ -98,12 +98,12 @@ teardown() {
|
||||
CIDS+=" "
|
||||
done
|
||||
CIDS_PATTERN=$(echo $CIDS | sed -e "s: :|:g")
|
||||
run bash -c "docker ps -q --no-trunc | egrep \"$CIDS_PATTERN\" | wc -l | grep 2"
|
||||
run /bin/bash -c "docker ps -q --no-trunc | egrep \"$CIDS_PATTERN\" | wc -l | grep 2"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
|
||||
run bash -c "dokku ps:scale $TEST_APP web=1"
|
||||
run /bin/bash -c "dokku ps:scale $TEST_APP web=1"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
@@ -113,12 +113,12 @@ teardown() {
|
||||
CIDS+=" "
|
||||
done
|
||||
CIDS_PATTERN=$(echo $CIDS | sed -e "s: :|:g")
|
||||
run bash -c "docker ps -q --no-trunc | egrep \"$CIDS_PATTERN\" | wc -l | grep 1"
|
||||
run /bin/bash -c "docker ps -q --no-trunc | egrep \"$CIDS_PATTERN\" | wc -l | grep 1"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
|
||||
run bash -c "dokku ps:scale $TEST_APP web=0"
|
||||
run /bin/bash -c "dokku ps:scale $TEST_APP web=0"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
@@ -128,7 +128,7 @@ teardown() {
|
||||
CIDS+=$(< $CID_FILE)
|
||||
CIDS+=" "
|
||||
done
|
||||
run bash -c "[[ -z \"$CIDS\" ]]"
|
||||
run /bin/bash -c "[[ -z \"$CIDS\" ]]"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
@@ -136,45 +136,45 @@ teardown() {
|
||||
|
||||
@test "(ps) dockerfile with procfile" {
|
||||
deploy_app dockerfile-procfile
|
||||
run bash -c "dokku ps:stop $TEST_APP"
|
||||
run /bin/bash -c "dokku ps:stop $TEST_APP"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
|
||||
run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
|
||||
run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_failure
|
||||
done
|
||||
|
||||
run bash -c "dokku ps:start $TEST_APP"
|
||||
run /bin/bash -c "dokku ps:start $TEST_APP"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
|
||||
run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
|
||||
run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
done
|
||||
|
||||
run bash -c "dokku ps:restart $TEST_APP"
|
||||
run /bin/bash -c "dokku ps:restart $TEST_APP"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
|
||||
run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
|
||||
run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
done
|
||||
|
||||
run bash -c "dokku ps:rebuild $TEST_APP"
|
||||
run /bin/bash -c "dokku ps:rebuild $TEST_APP"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
|
||||
run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
|
||||
run /bin/bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
@@ -192,14 +192,14 @@ teardown() {
|
||||
}
|
||||
|
||||
@test "(ps:scale) dockerfile with procfile" {
|
||||
run bash -c "dokku ps:scale $TEST_APP web=2 worker=2"
|
||||
run /bin/bash -c "dokku ps:scale $TEST_APP web=2 worker=2"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
|
||||
deploy_app dockerfile-procfile
|
||||
for PROC_TYPE in web worker; do
|
||||
run bash -c "docker ps --format '{{.ID}} {{.Command}}' --no-trunc"
|
||||
run /bin/bash -c "docker ps --format '{{.ID}} {{.Command}}' --no-trunc"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
@@ -213,12 +213,12 @@ teardown() {
|
||||
assert_output_contains "node ${PROC_TYPE}.js" 2
|
||||
done
|
||||
|
||||
run bash -c "dokku ps:scale $TEST_APP web=1 worker=1"
|
||||
run /bin/bash -c "dokku ps:scale $TEST_APP web=1 worker=1"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
for PROC_TYPE in web worker; do
|
||||
run bash -c "docker ps --format '{{.ID}} {{.Command}}' --no-trunc"
|
||||
run /bin/bash -c "docker ps --format '{{.ID}} {{.Command}}' --no-trunc"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
@@ -232,7 +232,7 @@ teardown() {
|
||||
assert_output_contains "node ${PROC_TYPE}.js"
|
||||
done
|
||||
|
||||
run bash -c "dokku ps:scale $TEST_APP web=0 worker=0"
|
||||
run /bin/bash -c "dokku ps:scale $TEST_APP web=0 worker=0"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
@@ -244,7 +244,7 @@ teardown() {
|
||||
CIDS+=" "
|
||||
done
|
||||
shopt -u nullglob
|
||||
run bash -c "[[ -z \"$CIDS\" ]]"
|
||||
run /bin/bash -c "[[ -z \"$CIDS\" ]]"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
|
||||
Reference in new issue
Block a user