diff --git a/contrib/copy-packages b/contrib/copy-packages index 702c6cbe2..69282e35b 100644 --- a/contrib/copy-packages +++ b/contrib/copy-packages @@ -5,7 +5,7 @@ import shutil import subprocess from requests.auth import HTTPBasicAuth -PACKAGECLOUD_API_TOKEN = os.getenv('DOKKU_PACKAGECLOUD_API_TOKEN') +PACKAGECLOUD_TOKEN = os.getenv('DOKKU_PACKAGECLOUD_TOKEN') def download_file(filename, url): @@ -25,7 +25,7 @@ def upload_file(filename): def main(): - auth = HTTPBasicAuth(PACKAGECLOUD_API_TOKEN, '') + auth = HTTPBasicAuth(PACKAGECLOUD_TOKEN, '') base = requests.get('https://packagecloud.io/api/v1/repos/dokku/dokku/packages/deb/ubuntu/trusty.json', auth=auth) data = base.json() diff --git a/contrib/release b/contrib/release index 100e351d1..4e87d9adf 100755 --- a/contrib/release +++ b/contrib/release @@ -332,7 +332,7 @@ main() { fn-require-bin "docker" fn-require-bin "git" fn-require-bin "package_cloud" - [[ -n "$PACKAGECLOUD_API_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_API_TOKEN environment variable" + [[ -n "$PACKAGECLOUD_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_TOKEN environment variable" CURRENT_VERSION="$(fn-version-current)" NEXT_VERSION="$(fn-version-next "$CURRENT_VERSION" "$RELEASE")" diff --git a/contrib/release-dokku-update b/contrib/release-dokku-update index 740524dc1..6e6becfd7 100755 --- a/contrib/release-dokku-update +++ b/contrib/release-dokku-update @@ -139,7 +139,7 @@ main() { fn-require-bin "docker" fn-require-bin "package_cloud" - [[ -n "$PACKAGECLOUD_API_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_API_TOKEN environment variable" + [[ -n "$PACKAGECLOUD_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_TOKEN environment variable" NEXT_VERSION="$(grep DOKKU_UPDATE_VERSION deb.mk | head -n1 | cut -d'=' -f2 | xargs)" IS_RELEASE="$(fn-is-release "$RELEASE")" diff --git a/contrib/release-herokuish b/contrib/release-herokuish index e6f4bbe03..fd921857c 100755 --- a/contrib/release-herokuish +++ b/contrib/release-herokuish @@ -139,7 +139,7 @@ main() { fn-require-bin "docker" fn-require-bin "package_cloud" - [[ -n "$PACKAGECLOUD_API_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_API_TOKEN environment variable" + [[ -n "$PACKAGECLOUD_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_TOKEN environment variable" NEXT_VERSION="$(grep HEROKUISH_VERSION deb.mk | head -n1 | cut -d'=' -f2 | xargs)" IS_RELEASE="$(fn-is-release "$RELEASE")" diff --git a/docs/development/release-process.md b/docs/development/release-process.md index 9409b3d5f..eec77d74b 100644 --- a/docs/development/release-process.md +++ b/docs/development/release-process.md @@ -5,13 +5,12 @@ Dokku is released in intervals *at most* three weeks apart, though may be releas To propose a release, the following tasks need to be performed: ```shell -export PACKAGECLOUD_API_TOKEN=SOME_TOKEN +export PACKAGECLOUD_TOKEN=SOME_TOKEN # supports major/minor/patch/betafish contrib/release ``` -> If you are a maintainer and need the PACKAGECLOUD_API_TOKEN in order to make a release, please contact @josegonzalez to get this information. - +> If you are a maintainer and need the PACKAGECLOUD_TOKEN in order to make a release, please contact @josegonzalez to get this information. As well, the ArchLinux package description *must* be updated via `vagrant up build-arch` (needs to be done after the tag is pushed to GitHub, because it is based on that) diff --git a/tests/unit/10_apps.bats b/tests/unit/10_apps.bats index 92463619e..a045c6372 100644 --- a/tests/unit/10_apps.bats +++ b/tests/unit/10_apps.bats @@ -11,41 +11,41 @@ teardown () { } @test "(apps) apps:create" { - run dokku apps:create $TEST_APP + run /bin/bash -c "dokku apps:create $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku apps:list | grep $TEST_APP" + run /bin/bash -c "dokku apps:list | grep $TEST_APP" echo "output: "$output echo "status: "$status assert_output $TEST_APP destroy_app - run dokku apps:create 1994testapp + run /bin/bash -c "dokku apps:create 1994testapp" echo "output: "$output echo "status: "$status assert_success - run dokku apps:create testapp:latest + run /bin/bash -c "dokku apps:create testapp:latest" echo "output: "$output echo "status: "$status assert_failure - run dokku apps:create testApp:latest + run /bin/bash -c "dokku apps:create testApp:latest" echo "output: "$output echo "status: "$status assert_failure - run dokku apps:create TestApp + run /bin/bash -c "dokku apps:create TestApp" echo "output: "$output echo "status: "$status assert_failure - run bash -c "dokku --app $TEST_APP apps:create" + run /bin/bash -c "dokku --app $TEST_APP apps:create" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku apps:list | grep $TEST_APP" + run /bin/bash -c "dokku apps:list | grep $TEST_APP" echo "output: "$output echo "status: "$status assert_output $TEST_APP @@ -54,7 +54,7 @@ teardown () { } @test "(apps) app autocreate disabled" { - run dokku config:set --no-restart --global DOKKU_DISABLE_APP_AUTOCREATION='true' + run /bin/bash -c "dokku config:set --no-restart --global DOKKU_DISABLE_APP_AUTOCREATION='true'" echo "output: "$output echo "status: "$status assert_success @@ -63,18 +63,18 @@ teardown () { echo "output: "$output echo "status: "$status assert_failure - run dokku config:unset --no-restart --global DOKKU_DISABLE_APP_AUTOCREATION + run /bin/bash -c "dokku config:unset --no-restart --global DOKKU_DISABLE_APP_AUTOCREATION" } @test "(apps) apps:destroy" { create_app - run bash -c "dokku --force apps:destroy $TEST_APP" + run /bin/bash -c "dokku --force apps:destroy $TEST_APP" echo "output: "$output echo "status: "$status assert_success create_app - run bash -c "dokku --force --app $TEST_APP apps:destroy" + run /bin/bash -c "dokku --force --app $TEST_APP apps:destroy" echo "output: "$output echo "status: "$status assert_success @@ -82,32 +82,32 @@ teardown () { @test "(apps) apps:rename" { deploy_app - run bash -c "dokku apps:rename $TEST_APP great-test-name" + run /bin/bash -c "dokku apps:rename $TEST_APP great-test-name" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku apps:list | grep $TEST_APP" + run /bin/bash -c "dokku apps:list | grep $TEST_APP" echo "output: "$output echo "status: "$status assert_output "" - run bash -c "curl --silent --write-out '%{http_code}\n' `dokku url great-test-name` | grep 404" + run /bin/bash -c "curl --silent --write-out '%{http_code}\n' `dokku url great-test-name` | grep 404" echo "output: "$output echo "status: "$status assert_output "" - run bash -c "dokku --force apps:destroy great-test-name" + run /bin/bash -c "dokku --force apps:destroy great-test-name" echo "output: "$output echo "status: "$status assert_success - run dokku apps:create $TEST_APP + run /bin/bash -c "dokku apps:create $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku apps:rename $TEST_APP great-test-name" + run /bin/bash -c "dokku apps:rename $TEST_APP great-test-name" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku --force apps:destroy great-test-name" + run /bin/bash -c "dokku --force apps:destroy great-test-name" echo "output: "$output echo "status: "$status assert_success @@ -116,11 +116,11 @@ teardown () { @test "(apps) apps:rename with tls" { setup_test_tls deploy_app - run bash -c "dokku apps:rename $TEST_APP great-test-name" + run /bin/bash -c "dokku apps:rename $TEST_APP great-test-name" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku --force apps:destroy great-test-name" + run /bin/bash -c "dokku --force apps:destroy great-test-name" echo "output: "$output echo "status: "$status assert_success @@ -128,19 +128,19 @@ teardown () { @test "(apps) apps:clone" { deploy_app - run bash -c "dokku apps:clone $TEST_APP great-test-name" + run /bin/bash -c "dokku apps:clone $TEST_APP great-test-name" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku apps:list | grep $TEST_APP" + run /bin/bash -c "dokku apps:list | grep $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run bash -c "curl --silent --write-out '%{http_code}\n' `dokku url great-test-name` | grep 404" + run /bin/bash -c "curl --silent --write-out '%{http_code}\n' `dokku url great-test-name` | grep 404" echo "output: "$output echo "status: "$status assert_output "" - run bash -c "dokku --force apps:destroy great-test-name" + run /bin/bash -c "dokku --force apps:destroy great-test-name" echo "output: "$output echo "status: "$status assert_success @@ -148,15 +148,15 @@ teardown () { @test "(apps) apps:clone --skip-deploy" { deploy_app - run bash -c "dokku apps:clone --skip-deploy $TEST_APP great-test-name" + run /bin/bash -c "dokku apps:clone --skip-deploy $TEST_APP great-test-name" echo "output: "$output echo "status: "$status assert_success - run bash -c "curl --silent --write-out '%{http_code}\n' `dokku url great-test-name` | grep 404" + run /bin/bash -c "curl --silent --write-out '%{http_code}\n' `dokku url great-test-name` | grep 404" echo "output: "$output echo "status: "$status assert_failure - run bash -c "dokku --force apps:destroy great-test-name" + run /bin/bash -c "dokku --force apps:destroy great-test-name" echo "output: "$output echo "status: "$status assert_success @@ -164,33 +164,33 @@ teardown () { @test "(apps) apps:clone --ignore-existing" { deploy_app - run bash -c "dokku apps:create great-test-name" + run /bin/bash -c "dokku apps:create great-test-name" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku apps:clone --ignore-existing $TEST_APP great-test-name" + run /bin/bash -c "dokku apps:clone --ignore-existing $TEST_APP great-test-name" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku --force apps:destroy great-test-name" + run /bin/bash -c "dokku --force apps:destroy great-test-name" echo "output: "$output echo "status: "$status assert_success } @test "(apps) apps:exists" { - run dokku apps:exists $TEST_APP + run /bin/bash -c "dokku apps:exists $TEST_APP" echo "output: "$output echo "status: "$status assert_failure create_app - run dokku apps:exists $TEST_APP + run /bin/bash -c "dokku apps:exists $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku --force apps:destroy $TEST_APP" + run /bin/bash -c "dokku --force apps:destroy $TEST_APP" echo "output: "$output echo "status: "$status assert_success @@ -200,37 +200,37 @@ teardown () { @test "(apps) apps:lock/locked/unlock" { create_app - run bash -c "dokku apps:report $TEST_APP --locked" + run /bin/bash -c "dokku apps:report $TEST_APP --locked" echo "output: "$output echo "status: "$status assert_output "false" - run bash -c "dokku apps:locked $TEST_APP" + run /bin/bash -c "dokku apps:locked $TEST_APP" echo "output: "$output echo "status: "$status assert_failure - run bash -c "dokku apps:lock $TEST_APP" + run /bin/bash -c "dokku apps:lock $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku apps:report $TEST_APP --locked" + run /bin/bash -c "dokku apps:report $TEST_APP --locked" echo "output: "$output echo "status: "$status assert_output "true" - run bash -c "dokku apps:locked $TEST_APP" + run /bin/bash -c "dokku apps:locked $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku apps:unlock $TEST_APP" + run /bin/bash -c "dokku apps:unlock $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku apps:report $TEST_APP --locked" + run /bin/bash -c "dokku apps:report $TEST_APP --locked" echo "output: "$output echo "status: "$status assert_output "false" diff --git a/tests/unit/10_certs.bats b/tests/unit/10_certs.bats index 9b2003b88..947749b80 100644 --- a/tests/unit/10_certs.bats +++ b/tests/unit/10_certs.bats @@ -28,42 +28,42 @@ teardown() { } @test "(certs) certs:add" { - run bash -c "dokku certs:add $TEST_APP $BATS_TMPDIR/tls/server.crt $BATS_TMPDIR/tls/server.key" + run /bin/bash -c "dokku certs:add $TEST_APP $BATS_TMPDIR/tls/server.crt $BATS_TMPDIR/tls/server.key" echo "output: "$output echo "status: "$status assert_success } @test "(certs) certs:add with multiple dots in the filename" { - run bash -c "dokku certs:add $TEST_APP $BATS_TMPDIR/tls/domain.com.crt $BATS_TMPDIR/tls/domain.com.key" + run /bin/bash -c "dokku certs:add $TEST_APP $BATS_TMPDIR/tls/domain.com.crt $BATS_TMPDIR/tls/domain.com.key" echo "output: "$output echo "status: "$status assert_success } @test "(certs) certs:add < tar" { - run bash -c "dokku certs:add $TEST_APP < $BATS_TEST_DIRNAME/server_ssl.tar" + run /bin/bash -c "dokku certs:add $TEST_APP < $BATS_TEST_DIRNAME/server_ssl.tar" echo "output: "$output echo "status: "$status assert_success } @test "(certs) certs:add < tar should ignore OSX hidden files" { - run bash -c "dokku certs:add $TEST_APP < $BATS_TEST_DIRNAME/osx_ssl_tarred.tar" + run /bin/bash -c "dokku certs:add $TEST_APP < $BATS_TEST_DIRNAME/osx_ssl_tarred.tar" echo "output: "$output echo "status: "$status assert_success } @test "(certs) certs:info" { - run bash -c "dokku certs:add $TEST_APP < $BATS_TEST_DIRNAME/server_ssl.tar && dokku certs:info $TEST_APP" + run /bin/bash -c "dokku certs:add $TEST_APP < $BATS_TEST_DIRNAME/server_ssl.tar && dokku certs:info $TEST_APP" echo "output: "$output echo "status: "$status assert_success } @test "(certs) certs:remove" { - run bash -c "dokku certs:add $TEST_APP < $BATS_TEST_DIRNAME/server_ssl.tar && dokku certs:remove $TEST_APP" + run /bin/bash -c "dokku certs:add $TEST_APP < $BATS_TEST_DIRNAME/server_ssl.tar && dokku certs:remove $TEST_APP" echo "output: "$output echo "status: "$status assert_success diff --git a/tests/unit/10_checks.bats b/tests/unit/10_checks.bats index 085c190d0..3fd1e8456 100644 --- a/tests/unit/10_checks.bats +++ b/tests/unit/10_checks.bats @@ -17,227 +17,227 @@ teardown() { } @test "(checks) checks" { - run bash -c "dokku checks $TEST_APP 2> /dev/null | grep $TEST_APP | xargs" + run /bin/bash -c "dokku checks $TEST_APP 2> /dev/null | grep $TEST_APP | xargs" echo "output: "$output echo "status: "$status assert_output "$TEST_APP none none" } @test "(checks) checks:disable" { - run bash -c "dokku checks:disable $TEST_APP" + run /bin/bash -c "dokku checks:disable $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_DISABLED" + run /bin/bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_DISABLED" echo "output: "$output echo "status: "$status assert_output "_all_" } @test "(checks) checks:disable -> checks:enable" { - run bash -c "dokku checks:disable $TEST_APP" + run /bin/bash -c "dokku checks:disable $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_DISABLED" + run /bin/bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_DISABLED" echo "output: "$output echo "status: "$status assert_output "_all_" - run bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_SKIPPED" + run /bin/bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_SKIPPED" echo "output: "$output echo "status: "$status assert_output "" - run bash -c "dokku checks:enable $TEST_APP" + run /bin/bash -c "dokku checks:enable $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_DISABLED" + run /bin/bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_DISABLED" echo "output: "$output echo "status: "$status assert_output "" - run bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_SKIPPED" + run /bin/bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_SKIPPED" echo "output: "$output echo "status: "$status assert_output "" } @test "(checks) checks:disable -> checks:skip" { - run bash -c "dokku checks:disable $TEST_APP web,worker,urgentworker,notifications" + run /bin/bash -c "dokku checks:disable $TEST_APP web,worker,urgentworker,notifications" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_DISABLED" + run /bin/bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_DISABLED" echo "output: "$output echo "status: "$status assert_output "web,worker,urgentworker,notifications" - run bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_SKIPPED" + run /bin/bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_SKIPPED" echo "output: "$output echo "status: "$status assert_output "" - run bash -c "dokku checks:skip $TEST_APP urgentworker,worker" + run /bin/bash -c "dokku checks:skip $TEST_APP urgentworker,worker" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_SKIPPED" + run /bin/bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_SKIPPED" echo "output: "$output echo "status: "$status assert_output "urgentworker,worker" - run bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_DISABLED" + run /bin/bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_DISABLED" echo "output: "$output echo "status: "$status assert_output "web,notifications" } @test "(checks) checks:skip" { - run bash -c "dokku checks:skip $TEST_APP" + run /bin/bash -c "dokku checks:skip $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_SKIPPED" + run /bin/bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_SKIPPED" echo "output: "$output echo "status: "$status assert_output "_all_" } @test "(checks) checks:skip -> checks:enable" { - run bash -c "dokku checks:skip $TEST_APP" + run /bin/bash -c "dokku checks:skip $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_SKIPPED" + run /bin/bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_SKIPPED" echo "output: "$output echo "status: "$status assert_output "_all_" - run bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_DISABLED" + run /bin/bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_DISABLED" echo "output: "$output echo "status: "$status assert_output "" - run bash -c "dokku checks:enable $TEST_APP" + run /bin/bash -c "dokku checks:enable $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_SKIPPED" + run /bin/bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_SKIPPED" echo "output: "$output echo "status: "$status assert_output "" - run bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_DISABLED" + run /bin/bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_DISABLED" echo "output: "$output echo "status: "$status assert_output "" } @test "(checks) checks:skip -> checks:disable" { - run bash -c "dokku checks:skip $TEST_APP web,worker,urgentworker,notifications" + run /bin/bash -c "dokku checks:skip $TEST_APP web,worker,urgentworker,notifications" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_SKIPPED" + run /bin/bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_SKIPPED" echo "output: "$output echo "status: "$status assert_output "web,worker,urgentworker,notifications" - run bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_DISABLED" + run /bin/bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_DISABLED" echo "output: "$output echo "status: "$status assert_output "" - run bash -c "dokku checks:disable $TEST_APP urgentworker,worker" + run /bin/bash -c "dokku checks:disable $TEST_APP urgentworker,worker" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_DISABLED" + run /bin/bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_DISABLED" echo "output: "$output echo "status: "$status assert_output "urgentworker,worker" - run bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_SKIPPED" + run /bin/bash -c "dokku config:get $TEST_APP DOKKU_CHECKS_SKIPPED" echo "output: "$output echo "status: "$status assert_output "web,notifications" } @test "(checks) checks:run" { - run bash -c "dokku ps:scale $TEST_APP worker=1" + run /bin/bash -c "dokku ps:scale $TEST_APP worker=1" echo "output: "$output echo "status: "$status assert_success deploy_app - run bash -c "dokku checks:run $TEST_APP" + run /bin/bash -c "dokku checks:run $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku checks:run $TEST_APP web" + run /bin/bash -c "dokku checks:run $TEST_APP web" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku checks:run $TEST_APP web,worker" + run /bin/bash -c "dokku checks:run $TEST_APP web,worker" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku checks:run $TEST_APP worker.1" + run /bin/bash -c "dokku checks:run $TEST_APP worker.1" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku checks:run $TEST_APP web2" + run /bin/bash -c "dokku checks:run $TEST_APP web2" echo "output: "$output echo "status: "$status assert_failure - run bash -c "dokku checks:run $TEST_APP web.2" + run /bin/bash -c "dokku checks:run $TEST_APP web.2" echo "output: "$output echo "status: "$status assert_failure } @test "(checks) checks:disable -> app start with missing containers" { - run bash -c "dokku ps:scale $TEST_APP worker=1" + run /bin/bash -c "dokku ps:scale $TEST_APP worker=1" echo "output: "$output echo "status: "$status assert_success deploy_app - run bash -c "dokku checks:disable $TEST_APP worker" + run /bin/bash -c "dokku checks:disable $TEST_APP worker" echo "output: "$output echo "status: "$status assert_success - 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 - run bash -c "dokku cleanup" + run /bin/bash -c "dokku cleanup" echo "output: "$output echo "status: "$status assert_success - 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 diff --git a/tests/unit/10_git.bats b/tests/unit/10_git.bats index 517b25f2a..db54e2086 100644 --- a/tests/unit/10_git.bats +++ b/tests/unit/10_git.bats @@ -13,7 +13,7 @@ teardown() { } @test "(git) deploy specific branch" { - run bash -c "dokku git:set --global deploy-branch global-branch" + run /bin/bash -c "dokku git:set --global deploy-branch global-branch" echo "output: "$output echo "status: "$status assert_success @@ -23,23 +23,23 @@ teardown() { echo "status: "$status assert_success - 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 - run bash -c "dokku git:set $TEST_APP deploy-branch app-branch" + run /bin/bash -c "dokku git:set $TEST_APP deploy-branch app-branch" GIT_REMOTE_BRANCH=app-branch deploy_app echo "output: "$output echo "status: "$status assert_success - 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 - run bash -c "dokku git:set --global deploy-branch" + run /bin/bash -c "dokku git:set --global deploy-branch" } @test "(git) ensure GIT_REV env var is set" { @@ -48,14 +48,14 @@ teardown() { echo "status: "$status assert_success - run bash -c "dokku config:get $TEST_APP GIT_REV" + run /bin/bash -c "dokku config:get $TEST_APP GIT_REV" echo "output: "$output echo "status: "$status assert_output_exists } @test "(git) disable GIT_REV" { - run bash -c "dokku git:set $TEST_APP rev-env-var" + run /bin/bash -c "dokku git:set $TEST_APP rev-env-var" echo "output: "$output echo "status: "$status assert_success @@ -65,14 +65,14 @@ teardown() { echo "status: "$status assert_success - run bash -c "dokku config:get $TEST_APP GIT_REV" + run /bin/bash -c "dokku config:get $TEST_APP GIT_REV" echo "output: "$output echo "status: "$status assert_output "" } @test "(git) customize the GIT_REV environment variable" { - run bash -c "dokku git:set $TEST_APP rev-env-var GIT_REV_ALT" + run /bin/bash -c "dokku git:set $TEST_APP rev-env-var GIT_REV_ALT" echo "output: "$output echo "status: "$status assert_success @@ -82,38 +82,38 @@ teardown() { echo "status: "$status assert_success - run bash -c "dokku config:get $TEST_APP GIT_REV_ALT" + run /bin/bash -c "dokku config:get $TEST_APP GIT_REV_ALT" echo "output: "$output echo "status: "$status assert_output_exists } @test "(git) git:initialize" { - run bash -c "test -d $DOKKU_ROOT/$TEST_APP/refs" + run /bin/bash -c "test -d $DOKKU_ROOT/$TEST_APP/refs" echo "output: "$output echo "status: "$status assert_failure - run bash -c "dokku git:initialize $TEST_APP" + run /bin/bash -c "dokku git:initialize $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run bash -c "test -d $DOKKU_ROOT/$TEST_APP/refs" + run /bin/bash -c "test -d $DOKKU_ROOT/$TEST_APP/refs" echo "output: "$output echo "status: "$status assert_success } @test "(git) git:initialize via deploy" { - run bash -c "test -d $DOKKU_ROOT/$TEST_APP/refs" + run /bin/bash -c "test -d $DOKKU_ROOT/$TEST_APP/refs" echo "output: "$output echo "status: "$status assert_failure deploy_app - run bash -c "test -d $DOKKU_ROOT/$TEST_APP/refs" + run /bin/bash -c "test -d $DOKKU_ROOT/$TEST_APP/refs" echo "output: "$output echo "status: "$status assert_success diff --git a/tests/unit/10_ps-dockerfile.bats b/tests/unit/10_ps-dockerfile.bats index 205014fcf..0de2a49df 100644 --- a/tests/unit/10_ps-dockerfile.bats +++ b/tests/unit/10_ps-dockerfile.bats @@ -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 diff --git a/tests/unit/10_ps-general.bats b/tests/unit/10_ps-general.bats index b5cc00ce1..baad19f7d 100644 --- a/tests/unit/10_ps-general.bats +++ b/tests/unit/10_ps-general.bats @@ -16,7 +16,7 @@ teardown() { deploy_app dockerfile CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1) - run bash -c "dokku ps:inspect $TEST_APP" + run /bin/bash -c "dokku ps:inspect $TEST_APP" echo "output: "$output echo "status: "$status assert_success @@ -41,7 +41,7 @@ EOF } @test "(ps:restart-policy) default policy" { - run bash -c "dokku --quiet ps:restart-policy $TEST_APP" + run /bin/bash -c "dokku --quiet ps:restart-policy $TEST_APP" echo "output: "$output echo "status: "$status assert_output "on-failure:10" @@ -50,12 +50,12 @@ EOF @test "(ps:restart-policy) ps:set-restart-policy, ps:restart-policy" { for policy in no unless-stopped always on-failure on-failure:20; do - run bash -c "dokku ps:set-restart-policy $TEST_APP $policy" + run /bin/bash -c "dokku ps:set-restart-policy $TEST_APP $policy" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku --quiet ps:restart-policy $TEST_APP" + run /bin/bash -c "dokku --quiet ps:restart-policy $TEST_APP" echo "output: "$output echo "status: "$status assert_output "$policy" @@ -64,12 +64,12 @@ EOF @test "(ps:restart-policy) deployed policy" { test_restart_policy="on-failure:20" - run bash -c "dokku ps:set-restart-policy $TEST_APP $test_restart_policy" + run /bin/bash -c "dokku ps:set-restart-policy $TEST_APP $test_restart_policy" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku --quiet ps:restart-policy $TEST_APP" + run /bin/bash -c "dokku --quiet ps:restart-policy $TEST_APP" echo "output: "$output echo "status: "$status assert_output "$test_restart_policy" @@ -77,7 +77,7 @@ EOF deploy_app dockerfile CID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1) - run bash -c "docker inspect -f '{{ .HostConfig.RestartPolicy.Name }}:{{ .HostConfig.RestartPolicy.MaximumRetryCount }}' $CID" + run /bin/bash -c "docker inspect -f '{{ .HostConfig.RestartPolicy.Name }}:{{ .HostConfig.RestartPolicy.MaximumRetryCount }}' $CID" echo "output: "$output echo "status: "$status assert_output "$test_restart_policy" diff --git a/tests/unit/10_ps-herokuish.bats b/tests/unit/10_ps-herokuish.bats index debb1cb35..c66d4531e 100644 --- a/tests/unit/10_ps-herokuish.bats +++ b/tests/unit/10_ps-herokuish.bats @@ -14,7 +14,7 @@ teardown() { } @test "(ps) herokuish" { - 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 @@ -22,45 +22,45 @@ teardown() { @test "(ps) herokuish" { deploy_app - 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 @@ -68,7 +68,7 @@ teardown() { } @test "(ps:scale) herokuish" { - 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 @@ -81,13 +81,13 @@ 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 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 @@ -98,13 +98,13 @@ 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 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 @@ -116,7 +116,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 @@ -128,22 +128,22 @@ teardown() { create_app "$MYAPP" deploy_app - 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 - run bash -c "dokku apps:list" + run /bin/bash -c "dokku apps:list" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku ps:restore" + run /bin/bash -c "dokku ps:restore" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku --quiet ps:report $TEST_APP | grep -q exited" + run /bin/bash -c "dokku --quiet ps:report $TEST_APP | grep -q exited" echo "output: "$output echo "status: "$status assert_success diff --git a/tests/unit/10_repo.bats b/tests/unit/10_repo.bats index 41b6fe066..ac962a671 100644 --- a/tests/unit/10_repo.bats +++ b/tests/unit/10_repo.bats @@ -13,20 +13,20 @@ teardown() { } @test "(repo) repo:gc, repo:purge-cache" { - run dokku repo:gc $TEST_APP + run /bin/bash -c "dokku repo:gc $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run bash -c "find $DOKKU_ROOT/$TEST_APP/cache -type f | wc -l | grep 0" + run /bin/bash -c "find $DOKKU_ROOT/$TEST_APP/cache -type f | wc -l | grep 0" echo "output: "$output echo "status: "$status assert_failure - run dokku repo:purge-cache $TEST_APP + run /bin/bash -c "dokku repo:purge-cache $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run bash -c "find $DOKKU_ROOT/$TEST_APP/cache -type f | wc -l | grep 0" + run /bin/bash -c "find $DOKKU_ROOT/$TEST_APP/cache -type f | wc -l | grep 0" echo "output: "$output echo "status: "$status assert_success diff --git a/tests/unit/10_tar.bats b/tests/unit/10_tar.bats index f1dbaa141..1eb96f34f 100644 --- a/tests/unit/10_tar.bats +++ b/tests/unit/10_tar.bats @@ -28,7 +28,7 @@ deploy_app_tar() { @test "(tar) non-tarbomb deploy using tar:in" { deploy_app_tar nodejs-express --transform 's,^,prefix/,' - run bash -c "response=\"$(curl -s -S ${TEST_APP}.dokku.me)\"; echo \$response; test \"\$response\" == \"nodejs/express\"" + run /bin/bash -c "response=\"$(curl -s -S ${TEST_APP}.dokku.me)\"; echo \$response; test \"\$response\" == \"nodejs/express\"" echo "output: "$output echo "status: "$status assert_success @@ -37,7 +37,7 @@ deploy_app_tar() { @test "(tar) tarbomb deploy using tar:in" { deploy_app_tar nodejs-express - run bash -c "response=\"$(curl -s -S ${TEST_APP}.dokku.me)\"; echo \$response; test \"\$response\" == \"nodejs/express\"" + run /bin/bash -c "response=\"$(curl -s -S ${TEST_APP}.dokku.me)\"; echo \$response; test \"\$response\" == \"nodejs/express\"" echo "output: "$output echo "status: "$status assert_success diff --git a/tests/unit/20_build-env.bats b/tests/unit/20_build-env.bats index 014b8dbbf..e637b463f 100644 --- a/tests/unit/20_build-env.bats +++ b/tests/unit/20_build-env.bats @@ -13,23 +13,23 @@ teardown() { } @test "(build-env) special characters" { - run dokku config:set --no-restart $TEST_APP NEWRELIC_APP_NAME="$TEST_APP (Staging)" + run /bin/bash -c "dokku config:set --no-restart $TEST_APP NEWRELIC_APP_NAME='$TEST_APP (Staging)'" echo "output: "$output echo "status: "$status assert_success deploy_app - run dokku config $TEST_APP + run /bin/bash -c "dokku config $TEST_APP" assert_success } @test "(build-env) default curl timeouts" { - run dokku config:unset --global CURL_CONNECT_TIMEOUT + run /bin/bash -c "dokku config:unset --global CURL_CONNECT_TIMEOUT" echo "output: "$output echo "status: "$status assert_success - run dokku config:unset --global CURL_TIMEOUT + run /bin/bash -c "dokku config:unset --global CURL_TIMEOUT" echo "output: "$output echo "status: "$status assert_success @@ -47,7 +47,7 @@ teardown() { } @test "(build-env) buildpack failure" { - run dokku config:set --no-restart $TEST_APP BUILDPACK_URL='https://github.com/dokku/fake-buildpack' + run /bin/bash -c "dokku config:set --no-restart $TEST_APP BUILDPACK_URL='https://github.com/dokku/fake-buildpack'" echo "output: "$output echo "status: "$status assert_success @@ -59,13 +59,13 @@ teardown() { } @test "(build-env) buildpack deploy with Dockerfile" { - run dokku config:set --no-restart $TEST_APP BUILDPACK_URL='https://github.com/heroku/heroku-buildpack-nodejs' + run /bin/bash -c "dokku config:set --no-restart $TEST_APP BUILDPACK_URL='https://github.com/heroku/heroku-buildpack-nodejs'" echo "output: "$output echo "status: "$status assert_success deploy_app dockerfile - run dokku --quiet config:get $TEST_APP DOKKU_APP_TYPE + run /bin/bash -c "dokku --quiet config:get $TEST_APP DOKKU_APP_TYPE" echo "output: "$output echo "status: "$status assert_output "herokuish" diff --git a/tests/unit/20_config.bats b/tests/unit/20_config.bats index 327abccaa..427061e80 100644 --- a/tests/unit/20_config.bats +++ b/tests/unit/20_config.bats @@ -30,15 +30,15 @@ teardown() { echo "output: "$output echo "status: "$status assert_success - run dokku config:get --global test_var2 + run /bin/bash -c "dokku config:get --global test_var2" echo "output: "$output echo "status: "$status assert_output 'hello world' - run dokku config:get --global test_var3 + run /bin/bash -c "dokku config:get --global test_var3" echo "output: "$output echo "status: "$status assert_output 'with\nnewline' - run bash -c "dokku config:get --global test_var4 | grep 'double\"quotes'" + run /bin/bash -c "dokku config:get --global test_var4 | grep 'double\"quotes'" echo "output: "$output echo "status: "$status assert_output 'double"quotes' @@ -49,15 +49,15 @@ teardown() { echo "output: "$output echo "status: "$status assert_success - run dokku config:get --global test_var + run /bin/bash -c "dokku config:get --global test_var" echo "output: "$output echo "status: "$status assert_success - run dokku config:unset --global test_var + run /bin/bash -c "dokku config:unset --global test_var" echo "output: "$output echo "status: "$status assert_success - run dokku config:get --global test_var + run /bin/bash -c "dokku config:get --global test_var" echo "output: "$output echo "status: "$status assert_output "" @@ -69,31 +69,31 @@ teardown() { echo "status: "$status assert_success - run bash -c "dokku config:get $TEST_APP test_var1 | grep true" + run /bin/bash -c "dokku config:get $TEST_APP test_var1 | grep true" echo "output: "$output echo "status: "$status assert_output "true" - run bash -c "dokku config:get $TEST_APP test_var2 | grep 'hello world'" + run /bin/bash -c "dokku config:get $TEST_APP test_var2 | grep 'hello world'" echo "output: "$output echo "status: "$status assert_output "hello world" - run bash -c "dokku config:get $TEST_APP test_var3 | grep 'double\"quotes'" + run /bin/bash -c "dokku config:get $TEST_APP test_var3 | grep 'double\"quotes'" echo "output: "$output echo "status: "$status assert_output 'double"quotes' } @test "(config) config:set/get (with --app)" { - run bash -c "dokku --app $TEST_APP config:set test_var1=true test_var2=\"hello world\"" + run /bin/bash -c "dokku --app $TEST_APP config:set test_var1=true test_var2=\"hello world\"" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku --app $TEST_APP config:get test_var1 | grep true" + run /bin/bash -c "dokku --app $TEST_APP config:get test_var1 | grep true" echo "output: "$output echo "status: "$status assert_output "true" - run bash -c "dokku --app $TEST_APP config:get test_var2 | grep 'hello world'" + run /bin/bash -c "dokku --app $TEST_APP config:get test_var2 | grep 'hello world'" echo "output: "$output echo "status: "$status assert_output "hello world" @@ -104,27 +104,27 @@ teardown() { echo "output: "$output echo "status: "$status assert_success - run dokku config:get $TEST_APP test_var + run /bin/bash -c "dokku config:get $TEST_APP test_var" echo "output: "$output echo "status: "$status assert_output "true" - run dokku config:unset $TEST_APP test_var + run /bin/bash -c "dokku config:unset $TEST_APP test_var" echo "output: "$output echo "status: "$status assert_success - run dokku config:get $TEST_APP test_var + run /bin/bash -c "dokku config:get $TEST_APP test_var" echo "output: "$output echo "status: "$status assert_output "" - run dokku config:get $TEST_APP test_var3 + run /bin/bash -c "dokku config:get $TEST_APP test_var3" echo "output: "$output echo "status: "$status assert_output 'with\nnewline' - run dokku config:unset $TEST_APP test_var3 + run /bin/bash -c "dokku config:unset $TEST_APP test_var3" echo "output: "$output echo "status: "$status assert_success - run dokku config:get $TEST_APP test_var3 + run /bin/bash -c "dokku config:get $TEST_APP test_var3" echo "output: "$output echo "status: "$status assert_output "" @@ -132,7 +132,7 @@ teardown() { @test "(config) global config (herokuish)" { deploy_app - run bash -c "dokku run $TEST_APP env | egrep '^global_test=true'" + run /bin/bash -c "dokku run $TEST_APP env | egrep '^global_test=true'" echo "output: "$output echo "status: "$status assert_success @@ -140,19 +140,19 @@ teardown() { @test "(config) global config (dockerfile)" { deploy_app dockerfile - run bash -c "dokku run $TEST_APP env | egrep '^global_test=true'" + run /bin/bash -c "dokku run $TEST_APP env | egrep '^global_test=true'" echo "output: "$output echo "status: "$status assert_success } @test "(config) config:show" { - run bash -c "dokku --app $TEST_APP config:set zKey=true bKey=true BKEY=true aKey=true" + run /bin/bash -c "dokku --app $TEST_APP config:set zKey=true bKey=true BKEY=true aKey=true" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku --app $TEST_APP config:show" + run /bin/bash -c "dokku --app $TEST_APP config:show" echo "output: "$output echo "status: "$stat diff --git a/tests/unit/20_domains.bats b/tests/unit/20_domains.bats index 9ec3f345a..28a309df4 100644 --- a/tests/unit/20_domains.bats +++ b/tests/unit/20_domains.bats @@ -18,34 +18,34 @@ teardown() { @test "(domains) domains" { dokku domains:setup $TEST_APP - run bash -c "dokku domains $TEST_APP 2> /dev/null | grep ${TEST_APP}.dokku.me" + run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null | grep ${TEST_APP}.dokku.me" echo "output: "$output echo "status: "$status assert_output "${TEST_APP}.dokku.me" } @test "(domains) domains:add" { - run dokku domains:add $TEST_APP www.test.app.dokku.me + run /bin/bash -c "dokku domains:add $TEST_APP www.test.app.dokku.me" echo "output: "$output echo "status: "$status assert_success - run dokku domains:add $TEST_APP test.app.dokku.me + run /bin/bash -c "dokku domains:add $TEST_APP test.app.dokku.me" echo "output: "$output echo "status: "$status assert_success - run dokku domains:add $TEST_APP 2.app.dokku.me + run /bin/bash -c "dokku domains:add $TEST_APP 2.app.dokku.me" echo "output: "$output echo "status: "$status assert_success - run dokku domains:add $TEST_APP a--domain.with--hyphens + run /bin/bash -c "dokku domains:add $TEST_APP a--domain.with--hyphens" echo "output: "$output echo "status: "$status assert_success - run dokku domains $TEST_APP 2> /dev/null + run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null" echo "output: "$output echo "status: "$status assert_success @@ -56,12 +56,12 @@ teardown() { } @test "(domains) domains:add (multiple)" { - run dokku domains:add $TEST_APP www.test.app.dokku.me test.app.dokku.me 2.app.dokku.me a--domain.with--hyphens + run /bin/bash -c "dokku domains:add $TEST_APP www.test.app.dokku.me test.app.dokku.me 2.app.dokku.me a--domain.with--hyphens" echo "output: "$output echo "status: "$status assert_success - run dokku domains $TEST_APP 2> /dev/null + run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null" echo "output: "$output echo "status: "$status assert_success @@ -72,36 +72,36 @@ teardown() { } @test "(domains) domains:add (duplicate)" { - run dokku domains:add $TEST_APP test.app.dokku.me + run /bin/bash -c "dokku domains:add $TEST_APP test.app.dokku.me" echo "output: "$output echo "status: "$status assert_success - run dokku domains:add $TEST_APP test.app.dokku.me + run /bin/bash -c "dokku domains:add $TEST_APP test.app.dokku.me" echo "output: "$output echo "status: "$status assert_success } @test "(domains) domains:add (invalid)" { - run dokku domains:add $TEST_APP http://test.app.dokku.me + run /bin/bash -c "dokku domains:add $TEST_APP http://test.app.dokku.me" echo "output: "$output echo "status: "$status assert_failure } @test "(domains) domains:remove" { - run dokku domains:add $TEST_APP test.app.dokku.me + run /bin/bash -c "dokku domains:add $TEST_APP test.app.dokku.me" echo "output: "$output echo "status: "$status assert_success - run dokku domains:remove $TEST_APP test.app.dokku.me + run /bin/bash -c "dokku domains:remove $TEST_APP test.app.dokku.me" echo "output: "$output echo "status: "$status assert_success - run dokku domains $TEST_APP 2> /dev/null + run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null" echo "output: "$output echo "status: "$status assert_success @@ -109,17 +109,17 @@ teardown() { } @test "(domains) domains:remove (multiple)" { - run dokku domains:add $TEST_APP www.test.app.dokku.me test.app.dokku.me 2.app.dokku.me + run /bin/bash -c "dokku domains:add $TEST_APP www.test.app.dokku.me test.app.dokku.me 2.app.dokku.me" echo "output: "$output echo "status: "$status assert_success - run dokku domains:remove $TEST_APP www.test.app.dokku.me test.app.dokku.me + run /bin/bash -c "dokku domains:remove $TEST_APP www.test.app.dokku.me test.app.dokku.me" echo "output: "$output echo "status: "$status assert_success - run dokku domains $TEST_APP 2> /dev/null + run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null" echo "output: "$output echo "status: "$status assert_success @@ -129,17 +129,17 @@ teardown() { } @test "(domains) domains:remove (wildcard domain)" { - run dokku domains:add $TEST_APP *.dokku.me + run /bin/bash -c "dokku domains:add $TEST_APP *.dokku.me" echo "output: "$output echo "status: "$status assert_success - run dokku domains:remove $TEST_APP *.dokku.me + run /bin/bash -c "dokku domains:remove $TEST_APP *.dokku.me" echo "output: "$output echo "status: "$status assert_success - run dokku domains $TEST_APP 2> /dev/null + run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null" echo "output: "$output echo "status: "$status assert_success @@ -147,17 +147,17 @@ teardown() { } @test "(domains) domains:set" { - run dokku domains:add $TEST_APP www.test.app.dokku.me test.app.dokku.me + run /bin/bash -c "dokku domains:add $TEST_APP www.test.app.dokku.me test.app.dokku.me" echo "output: "$output echo "status: "$status assert_success - run dokku domains:set $TEST_APP 2.app.dokku.me a--domain.with--hyphens + run /bin/bash -c "dokku domains:set $TEST_APP 2.app.dokku.me a--domain.with--hyphens" echo "output: "$output echo "status: "$status assert_success - run dokku domains $TEST_APP 2> /dev/null + run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null" echo "output: "$output echo "status: "$status assert_success @@ -168,17 +168,17 @@ teardown() { } @test "(domains) domains:clear" { - run dokku domains:add $TEST_APP test.app.dokku.me + run /bin/bash -c "dokku domains:add $TEST_APP test.app.dokku.me" echo "output: "$output echo "status: "$status assert_success - run dokku domains:clear $TEST_APP + run /bin/bash -c "dokku domains:clear $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run dokku domains $TEST_APP 2> /dev/null + run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null" echo "output: "$output echo "status: "$status assert_success @@ -186,60 +186,60 @@ teardown() { } @test "(domains) domains:add-global" { - run dokku domains:add-global global.dokku.me + run /bin/bash -c "dokku domains:add-global global.dokku.me" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku domains 2> /dev/null | egrep -qw '^global.dokku.me\$'" + run /bin/bash -c "dokku domains 2> /dev/null | egrep -qw '^global.dokku.me\$'" echo "output: "$output echo "status: "$status assert_success } @test "(domains) domains:add-global (multiple)" { - run dokku domains:add-global global1.dokku.me global2.dokku.me global3.dokku.me + run /bin/bash -c "dokku domains:add-global global1.dokku.me global2.dokku.me global3.dokku.me" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku domains 2> /dev/null | grep -q global1.dokku.me" + run /bin/bash -c "dokku domains 2> /dev/null | grep -q global1.dokku.me" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku domains 2> /dev/null | grep -q global2.dokku.me" + run /bin/bash -c "dokku domains 2> /dev/null | grep -q global2.dokku.me" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku domains 2> /dev/null | grep -q global3.dokku.me" + run /bin/bash -c "dokku domains 2> /dev/null | grep -q global3.dokku.me" echo "output: "$output echo "status: "$status assert_success } @test "(domains) domains:remove-global" { - run dokku domains:add-global global.dokku.me + run /bin/bash -c "dokku domains:add-global global.dokku.me" echo "output: "$output echo "status: "$status assert_success - run dokku domains:remove-global global.dokku.me + run /bin/bash -c "dokku domains:remove-global global.dokku.me" echo "output: "$output echo "status: "$status refute_line "global.dokku.me" } @test "(domains) domains (multiple global domains)" { - run dokku domains:add-global global1.dokku.me global2.dokku.me + run /bin/bash -c "dokku domains:add-global global1.dokku.me global2.dokku.me" echo "output: "$output echo "status: "$status assert_success dokku domains:setup $TEST_APP - run dokku domains $TEST_APP 2> /dev/null + run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null" echo "output: "$output echo "status: "$status assert_success @@ -248,19 +248,19 @@ teardown() { } @test "(domains) domains:set-global" { - run dokku domains:add-global global1.dokku.me global2.dokku.me + run /bin/bash -c "dokku domains:add-global global1.dokku.me global2.dokku.me" echo "output: "$output echo "status: "$status assert_success - run dokku domains:set-global global3.dokku.me global4.dokku.me + run /bin/bash -c "dokku domains:set-global global3.dokku.me global4.dokku.me" echo "output: "$output echo "status: "$status assert_success dokku domains:setup $TEST_APP - run dokku domains $TEST_APP 2> /dev/null + run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null" echo "output: "$output echo "status: "$status assert_success diff --git a/tests/unit/20_network.bats b/tests/unit/20_network.bats index 80e35203e..8cce52c03 100644 --- a/tests/unit/20_network.bats +++ b/tests/unit/20_network.bats @@ -45,8 +45,8 @@ assert_external_port() { deploy_app assert_nonssl_domain "${TEST_APP}.dokku.me" - run dokku network:set $TEST_APP bind-all-interfaces true - run dokku ps:rebuild $TEST_APP + run /bin/bash -c "dokku network:set $TEST_APP bind-all-interfaces true" + run /bin/bash -c "dokku ps:rebuild $TEST_APP" echo "output: "$output echo "status: "$status assert_success @@ -56,8 +56,8 @@ assert_external_port() { assert_external_port $(< $CID_FILE) success done - run dokku network:set $TEST_APP bind-all-interfaces false - run dokku ps:rebuild $TEST_APP + run /bin/bash -c "dokku network:set $TEST_APP bind-all-interfaces false" + run /bin/bash -c "dokku ps:rebuild $TEST_APP" echo "output: "$output echo "status: "$status assert_success diff --git a/tests/unit/20_nginx-vhosts_1.bats b/tests/unit/20_nginx-vhosts_1.bats index 17c576ed2..910ed0465 100644 --- a/tests/unit/20_nginx-vhosts_1.bats +++ b/tests/unit/20_nginx-vhosts_1.bats @@ -35,7 +35,7 @@ teardown() { @test "(nginx-vhosts) nginx:build-config (domains:add pre deploy)" { create_app - run dokku domains:add $TEST_APP www.test.app.dokku.me + run /bin/bash -c "dokku domains:add $TEST_APP www.test.app.dokku.me" echo "output: "$output echo "status: "$status assert_success diff --git a/tests/unit/30_client.bats b/tests/unit/30_client.bats index 2914688e1..6c18a8060 100644 --- a/tests/unit/30_client.bats +++ b/tests/unit/30_client.bats @@ -31,12 +31,12 @@ teardown() { @test "(client) apps:create AND apps:destroy with random name" { setup_client_repo - run bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh apps:create" + run /bin/bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh apps:create" echo "output: "$output echo "status: "$status assert_success git remote | grep dokku - run bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh apps:destroy --force" + run /bin/bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh apps:destroy --force" echo "output: "$output echo "status: "$status assert_success @@ -45,13 +45,13 @@ teardown() { @test "(client) apps:create AND apps:destroy with name" { setup_client_repo local test_app_name=test-apps-create-with-name - run bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh apps:create $test_app_name" + run /bin/bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh apps:create $test_app_name" echo "output: "$output echo "status: "$status assert_success git remote | grep dokku git remote -v | grep $test_app_name - run bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh apps:destroy --force" + run /bin/bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh apps:destroy --force" echo "output: "$output echo "status: "$status assert_success @@ -88,11 +88,11 @@ teardown() { } @test "(client) domains" { - run bash -c "./contrib/dokku_client.sh domains:setup $TEST_APP" + run /bin/bash -c "./contrib/dokku_client.sh domains:setup $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run bash -c "./contrib/dokku_client.sh domains $TEST_APP | grep -q ${TEST_APP}.dokku.me" + run /bin/bash -c "./contrib/dokku_client.sh domains $TEST_APP | grep -q ${TEST_APP}.dokku.me" echo "output: "$output echo "status: "$status assert_success @@ -137,7 +137,7 @@ teardown() { # # 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." # deploy_app -# run bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh ps $TEST_APP | grep -q 'node web.js'" +# run /bin/bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh ps $TEST_APP | grep -q 'node web.js'" # echo "output: "$output # echo "status: "$status # assert_success @@ -145,16 +145,16 @@ teardown() { @test "(client) ps:start" { deploy_app - run bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh ps:stop $TEST_APP" + run /bin/bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh ps:stop $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh ps:start $TEST_APP" + run /bin/bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh 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 @@ -163,12 +163,12 @@ teardown() { @test "(client) ps:stop" { deploy_app - run bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh ps:stop $TEST_APP" + run /bin/bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh 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 @@ -177,12 +177,12 @@ teardown() { @test "(client) ps:restart" { deploy_app - run bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh ps:restart $TEST_APP" + run /bin/bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh 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 diff --git a/tests/unit/30_config-oddities.bats b/tests/unit/30_config-oddities.bats index b5bad6587..934ae6ae2 100644 --- a/tests/unit/30_config-oddities.bats +++ b/tests/unit/30_config-oddities.bats @@ -19,14 +19,14 @@ teardown() { } @test "(config-oddities) set-local/get with multiple spaces and $" { - run dokku config:set --global double_quotes="hello world$" single_quotes='hello$ world' + run /bin/bash -c "dokku config:set --global double_quotes=\"hello world$\" single_quotes='hello$ world'" echo "output: "$output echo "status: "$status - run dokku config:get --global double_quotes + run /bin/bash -c "dokku config:get --global double_quotes" echo "output: "$output echo "status: "$status assert_output 'hello world$' - run dokku config:get --global single_quotes + run /bin/bash -c "dokku config:get --global single_quotes" echo "output: "$output echo "status: "$status assert_output 'hello$ world' @@ -36,10 +36,10 @@ teardown() { @test "(config-oddities) set-local/get with multiple lines" { multiline='line one line two' - run dokku config:set --global double_quotes="$multiline" + run /bin/bash -c "dokku config:set --global double_quotes=\"$multiline\"" echo "output: "$output echo "status: "$status - run dokku config:get --global double_quotes + run /bin/bash -c "dokku config:get --global double_quotes" echo "output: "$output echo "status: "$status assert_output "$multiline" diff --git a/tests/unit/30_core_1.bats b/tests/unit/30_core_1.bats index e9c9c235d..483b111f0 100644 --- a/tests/unit/30_core_1.bats +++ b/tests/unit/30_core_1.bats @@ -18,7 +18,7 @@ teardown() { assert_urls() { urls=$@ - run dokku urls $TEST_APP + run /bin/bash -c "dokku urls $TEST_APP" echo "output: "$output echo "status: "$status assert_output < <(tr ' ' '\n' <<< "${urls}") @@ -28,30 +28,30 @@ assert_urls() { deploy_app # make sure we have many exited containers of the same 'type' - run bash -c "for cnt in 1 2 3; do dokku run $TEST_APP echo $TEST_APP; done" + run /bin/bash -c "for cnt in 1 2 3; do dokku run $TEST_APP echo $TEST_APP; done" echo "output: "$output echo "status: "$status assert_success - run bash -c "docker ps -a -f 'status=exited' --no-trunc=true | grep \"/exec echo $TEST_APP\"" + run /bin/bash -c "docker ps -a -f 'status=exited' --no-trunc=true | grep \"/exec echo $TEST_APP\"" echo "output: "$output echo "status: "$status assert_success RANDOM_RUN_CID="$(docker run -d gliderlabs/herokuish bash)" docker ps -a - run dokku cleanup + run /bin/bash -c "dokku cleanup" echo "output: "$output echo "status: "$status assert_success sleep 5 # wait for dokku cleanup to happen in the background docker ps -a - run bash -c "docker ps -a -f 'status=exited' --no-trunc=true | grep \"/exec echo $TEST_APP\"" + run /bin/bash -c "docker ps -a -f 'status=exited' --no-trunc=true | grep \"/exec echo $TEST_APP\"" echo "output: "$output echo "status: "$status assert_failure - run bash -c "docker inspect $RANDOM_RUN_CID" + run /bin/bash -c "docker inspect $RANDOM_RUN_CID" echo "output: "$output echo "status: "$status assert_success @@ -60,49 +60,49 @@ assert_urls() { @test "(core) run (with DOKKU_RM_CONTAINER/--rm-container)" { deploy_app - run bash -c "dokku --rm-container run $TEST_APP echo $TEST_APP" + run /bin/bash -c "dokku --rm-container run $TEST_APP echo $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run bash -c "docker ps -a -f 'status=exited' --no-trunc=true | grep \"/exec echo $TEST_APP\"" + run /bin/bash -c "docker ps -a -f 'status=exited' --no-trunc=true | grep \"/exec echo $TEST_APP\"" echo "output: "$output echo "status: "$status assert_failure - run bash -c "dokku config:set --no-restart $TEST_APP DOKKU_RM_CONTAINER=1" + run /bin/bash -c "dokku config:set --no-restart $TEST_APP DOKKU_RM_CONTAINER=1" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku --rm-container run $TEST_APP echo $TEST_APP" + run /bin/bash -c "dokku --rm-container run $TEST_APP echo $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run bash -c "docker ps -a -f 'status=exited' --no-trunc=true | grep \"/exec echo $TEST_APP\"" + run /bin/bash -c "docker ps -a -f 'status=exited' --no-trunc=true | grep \"/exec echo $TEST_APP\"" echo "output: "$output echo "status: "$status assert_failure - run bash -c "dokku config:unset --no-restart $TEST_APP DOKKU_RM_CONTAINER" + run /bin/bash -c "dokku config:unset --no-restart $TEST_APP DOKKU_RM_CONTAINER" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku config:set --global DOKKU_RM_CONTAINER=1" + run /bin/bash -c "dokku config:set --global DOKKU_RM_CONTAINER=1" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku --rm-container run $TEST_APP echo $TEST_APP" + run /bin/bash -c "dokku --rm-container run $TEST_APP echo $TEST_APP" echo "output: "$output echo "status: "$status assert_success - run bash -c "docker ps -a -f 'status=exited' --no-trunc=true | grep \"/exec echo $TEST_APP\"" + run /bin/bash -c "docker ps -a -f 'status=exited' --no-trunc=true | grep \"/exec echo $TEST_APP\"" echo "output: "$output echo "status: "$status assert_failure - run bash -c "dokku config:unset --global DOKKU_RM_CONTAINER" + run /bin/bash -c "dokku config:unset --global DOKKU_RM_CONTAINER" echo "output: "$output echo "status: "$status assert_success @@ -112,17 +112,17 @@ assert_urls() { deploy_app RANDOM_RUN_CID="$(dokku --detach run $TEST_APP sleep 300)" - run bash -c "docker inspect -f '{{ .State.Status }}' $RANDOM_RUN_CID" + run /bin/bash -c "docker inspect -f '{{ .State.Status }}' $RANDOM_RUN_CID" echo "output: "$output echo "status: "$status assert_output "running" - run bash -c "docker stop $RANDOM_RUN_CID" + run /bin/bash -c "docker stop $RANDOM_RUN_CID" echo "output: "$output echo "status: "$status assert_success - run dokku cleanup + run /bin/bash -c "dokku cleanup" echo "output: "$output echo "status: "$status assert_success diff --git a/tests/unit/30_events.bats b/tests/unit/30_events.bats index 8136e15a5..a112a4706 100644 --- a/tests/unit/30_events.bats +++ b/tests/unit/30_events.bats @@ -13,30 +13,30 @@ teardown() { } @test "(events) check conffiles" { - run bash -c "test -f /etc/logrotate.d/dokku" + run /bin/bash -c "test -f /etc/logrotate.d/dokku" echo "output: "$output echo "status: "$status assert_success - run bash -c "test -f /etc/rsyslog.d/99-dokku.conf" + run /bin/bash -c "test -f /etc/rsyslog.d/99-dokku.conf" echo "output: "$output echo "status: "$status assert_success - run bash -c "stat -c '%U:%G:%a' /var/log/dokku/" + run /bin/bash -c "stat -c '%U:%G:%a' /var/log/dokku/" echo "output: "$output echo "status: "$status assert_output "syslog:dokku:775" - run bash -c "stat -c '%U:%G:%a' /var/log/dokku/events.log" + run /bin/bash -c "stat -c '%U:%G:%a' /var/log/dokku/events.log" echo "output: "$output echo "status: "$status assert_output "syslog:dokku:664" } @test "(events) log commands" { - run dokku events:on + run /bin/bash -c "dokku events:on" deploy_app - run dokku events + run /bin/bash -c "dokku events" echo "output: "$output echo "status: "$status assert_success - run dokku events:off + run /bin/bash -c "dokku events:off" } diff --git a/tests/unit/40_core_2.bats b/tests/unit/40_core_2.bats index 9a82423a5..e0f6d07c4 100644 --- a/tests/unit/40_core_2.bats +++ b/tests/unit/40_core_2.bats @@ -15,7 +15,7 @@ teardown() { assert_urls() { urls=$@ - run dokku urls $TEST_APP + run /bin/bash -c "dokku urls $TEST_APP" echo "output: "$output echo "status: "$status echo "urls:" $(tr ' ' '\n' <<< "${urls}" | sort) @@ -24,7 +24,7 @@ assert_urls() { assert_url() { url=$1 - run dokku url $TEST_APP + run /bin/bash -c "dokku url $TEST_APP" echo "output: "$output echo "status: "$status echo "url: ${url}" diff --git a/tests/unit/40_plugin.bats b/tests/unit/40_plugin.bats index 9f90aaf76..6d1b3e225 100644 --- a/tests/unit/40_plugin.bats +++ b/tests/unit/40_plugin.bats @@ -18,91 +18,91 @@ teardown() { } @test "(plugin) plugin:install, plugin:disable, plugin:update plugin:uninstall" { - run bash -c "dokku plugin:install $TEST_PLUGIN_GIT_REPO --name $TEST_PLUGIN_NAME" + run /bin/bash -c "dokku plugin:install $TEST_PLUGIN_GIT_REPO --name $TEST_PLUGIN_NAME" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku plugin:update $TEST_PLUGIN_NAME" + run /bin/bash -c "dokku plugin:update $TEST_PLUGIN_NAME" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME" + run /bin/bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME" echo "output: "$output echo "status: "$status assert_success - run bash -c "sudo -E -u nobody dokku plugin:uninstall $TEST_PLUGIN_NAME" + run /bin/bash -c "sudo -E -u nobody dokku plugin:uninstall $TEST_PLUGIN_NAME" echo "output: "$output echo "status: "$status assert_failure - run bash -c "dokku plugin:disable $TEST_PLUGIN_NAME" + run /bin/bash -c "dokku plugin:disable $TEST_PLUGIN_NAME" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku plugin | grep disabled | grep $TEST_PLUGIN_NAME" + run /bin/bash -c "dokku plugin | grep disabled | grep $TEST_PLUGIN_NAME" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku plugin:uninstall $TEST_PLUGIN_NAME" + run /bin/bash -c "dokku plugin:uninstall $TEST_PLUGIN_NAME" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku plugin | grep $TEST_PLUGIN_NAME" + run /bin/bash -c "dokku plugin | grep $TEST_PLUGIN_NAME" echo "output: "$output echo "status: "$status assert_failure } @test "(plugin) plugin:install plugin:update (with tag)" { - run bash -c "dokku plugin:install $TEST_PLUGIN_GIT_REPO --committish v0.2.0 --name $TEST_PLUGIN_NAME" + run /bin/bash -c "dokku plugin:install $TEST_PLUGIN_GIT_REPO --committish v0.2.0 --name $TEST_PLUGIN_NAME" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME | grep 0.2.0" + run /bin/bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME | grep 0.2.0" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku plugin:update $TEST_PLUGIN_NAME v0.3.0" + run /bin/bash -c "dokku plugin:update $TEST_PLUGIN_NAME v0.3.0" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME | grep 0.2.0" + run /bin/bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME | grep 0.2.0" echo "output: "$output echo "status: "$status assert_failure - run bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME | grep 0.3.0" + run /bin/bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME | grep 0.3.0" echo "output: "$output echo "status: "$status assert_success } @test "(plugin) plugin:install, plugin:disable, plugin:uninstall as non-root user failure" { - run bash -c "sudo -E -u nobody dokku plugin:install $TEST_PLUGIN_GIT_REPO" + run /bin/bash -c "sudo -E -u nobody dokku plugin:install $TEST_PLUGIN_GIT_REPO" echo "output: "$output echo "status: "$status assert_failure - run bash -c "dokku plugin:install $TEST_PLUGIN_GIT_REPO" + run /bin/bash -c "dokku plugin:install $TEST_PLUGIN_GIT_REPO" echo "output: "$output echo "status: "$status assert_success - run bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME" + run /bin/bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME" echo "output: "$output echo "status: "$status assert_success - run bash -c "sudo -E -u nobody dokku plugin:disable $TEST_PLUGIN_NAME" + run /bin/bash -c "sudo -E -u nobody dokku plugin:disable $TEST_PLUGIN_NAME" echo "output: "$output echo "status: "$status assert_failure diff --git a/tests/unit/40_proxy.bats b/tests/unit/40_proxy.bats index 8b3a6cebd..91cf3f918 100644 --- a/tests/unit/40_proxy.bats +++ b/tests/unit/40_proxy.bats @@ -45,7 +45,7 @@ assert_external_port() { deploy_app assert_nonssl_domain "${TEST_APP}.dokku.me" - run dokku proxy:disable $TEST_APP + run /bin/bash -c "dokku proxy:disable $TEST_APP" echo "output: "$output echo "status: "$status assert_success @@ -54,7 +54,7 @@ assert_external_port() { assert_external_port $(< $CID_FILE) failure done - run dokku proxy:enable $TEST_APP + run /bin/bash -c "dokku proxy:enable $TEST_APP" echo "output: "$output echo "status: "$status assert_success @@ -129,7 +129,7 @@ assert_external_port() { @test "(proxy) proxy:ports (post-deploy add)" { deploy_app - run dokku proxy:ports-add $TEST_APP http:8080:5000 http:8081:5000 + run /bin/bash -c "dokku proxy:ports-add $TEST_APP http:8080:5000 http:8081:5000" echo "output: "$output echo "status: "$status assert_success diff --git a/tests/unit/test_helper.bash b/tests/unit/test_helper.bash index ab4dbb5b5..d04462739 100644 --- a/tests/unit/test_helper.bash +++ b/tests/unit/test_helper.bash @@ -157,7 +157,7 @@ add_domain() { # shellcheck disable=SC2119 check_urls() { local PATTERN="$1" - run bash -c "dokku --quiet urls $TEST_APP | egrep \"${1}\"" + run /bin/bash -c "dokku --quiet urls $TEST_APP | egrep \"${1}\"" echo "output: $output" echo "status: $status" assert_success