fix: ensure we cleanup the data directory on app deletion

Also use a variable for the clone root dir.
This commit is contained in:
Jose Diaz-Gonzalez
2024-03-13 05:37:06 -04:00
parent eb9a75496c
commit 10468ce47d
2 changed files with 7 additions and 2 deletions

View File

@@ -196,10 +196,12 @@ cmd-git-sync() {
verify_app_name "$APP"
if [[ -d "$DOKKU_LIB_ROOT/data/git/$APP" ]]; then
local APP_CLONE_ROOT="$DOKKU_LIB_ROOT/data/git/$APP"
if [[ -d "$APP_CLONE_ROOT" ]]; then
if has_tty eq 0; then
cmd-git-unlock "$APP"
if [[ -d "$DOKKU_LIB_ROOT/data/git/$APP" ]]; then
if [[ -d "$APP_CLONE_ROOT" ]]; then
dokku_log_fail "Failed to delete existing clone folder"
exit 15
fi
@@ -266,6 +268,7 @@ cmd-git-unlock() {
dokku_log_info1 "No clone folder exists app already unlocked"
fi
}
cmd-git-public-key() {
declare desc="outputs the dokku public deploy key"
local cmd="git:public-key"

View File

@@ -7,8 +7,10 @@ trigger-git-post-delete() {
declare desc="destroys the git properties for a given app"
declare trigger="post-delete"
declare APP="$1"
local APP_CLONE_ROOT="$DOKKU_LIB_ROOT/data/git/$APP"
fn-plugin-property-destroy "git" "$APP"
rm -rf "$APP_CLONE_ROOT"
}
trigger-git-post-delete "$@"