Merge pull request #9062 from dokku/explicit-datastore-destroy-force

Pass force to the datastore command that owns it
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2026-09-20 04:09:03 -04:00
commit d5b2e699f2
2 files changed
+10 -10

No files matched your search

+2 -2
View File
@@ -179,12 +179,12 @@ teardown() {
echo "status: $status"
assert_success
run /bin/bash -c "dokku --force postgres:destroy $TEST_APP"
run /bin/bash -c "dokku postgres:destroy $TEST_APP --force"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku --force redis:destroy $TEST_APP"
run /bin/bash -c "dokku redis:destroy $TEST_APP --force"
echo "output: $output"
echo "status: $status"
assert_success
+8 -8
View File
@@ -7,19 +7,19 @@ setup() {
[[ -f "$DOKKU_ROOT/VHOST" ]] && cp -fp "$DOKKU_ROOT/VHOST" "$DOKKU_ROOT/VHOST.bak"
create_app
dokku --force postgres:destroy $TEST_APP 2>/dev/null || true
dokku --force redis:destroy $TEST_APP 2>/dev/null || true
dokku --force postgres:destroy $TEST_APP-other 2>/dev/null || true
dokku --force redis:destroy $TEST_APP-other 2>/dev/null || true
dokku postgres:destroy $TEST_APP --force 2>/dev/null || true
dokku redis:destroy $TEST_APP --force 2>/dev/null || true
dokku postgres:destroy $TEST_APP-other --force 2>/dev/null || true
dokku redis:destroy $TEST_APP-other --force 2>/dev/null || true
}
teardown() {
destroy_app
dokku --force postgres:destroy $TEST_APP 2>/dev/null || true
dokku --force redis:destroy $TEST_APP 2>/dev/null || true
dokku --force postgres:destroy $TEST_APP-other 2>/dev/null || true
dokku --force redis:destroy $TEST_APP-other 2>/dev/null || true
dokku postgres:destroy $TEST_APP --force 2>/dev/null || true
dokku redis:destroy $TEST_APP --force 2>/dev/null || true
dokku postgres:destroy $TEST_APP-other --force 2>/dev/null || true
dokku redis:destroy $TEST_APP-other --force 2>/dev/null || true
[[ -f "$DOKKU_ROOT/VHOST.bak" ]] && mv "$DOKKU_ROOT/VHOST.bak" "$DOKKU_ROOT/VHOST" && chown dokku:dokku "$DOKKU_ROOT/VHOST"
global_teardown