From 11b09fb375e8f015a94074a17e1329bc06f411b0 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 20 Sep 2026 02:58:02 -0400 Subject: [PATCH] fix: pass force to the datastore command that owns it The datastore destroys were written with dokku's global `--force`, which works only because dokku translates it into `DOKKU_APPS_FORCE_DELETE` and the plugin reads that environment variable back. The flag belongs to the subcommand, which declares it, so it is passed there instead. Only the datastore calls move. `network:destroy` and `storage:destroy` are dokku's own commands and keep dokku's own convention. --- tests/unit/app-json.bats | 4 ++-- tests/unit/ports.bats | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/unit/app-json.bats b/tests/unit/app-json.bats index b9bb6f8bf..31bf44275 100644 --- a/tests/unit/app-json.bats +++ b/tests/unit/app-json.bats @@ -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 diff --git a/tests/unit/ports.bats b/tests/unit/ports.bats index e09440b60..5a159efc1 100644 --- a/tests/unit/ports.bats +++ b/tests/unit/ports.bats @@ -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