Merge pull request #6705 from dokku/6690-git-data-dir-cleanup

Ensure we cleanup the data directory on app deletion
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2024-03-13 05:39:17 -04:00
commit eaf641f9e3
2 files changed
+7 -2

No files matched your search

+5 -2
View File
@@ -196,10 +196,12 @@ cmd-git-sync() {
verify_app_name "$APP" 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 if has_tty eq 0; then
cmd-git-unlock "$APP" 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" dokku_log_fail "Failed to delete existing clone folder"
exit 15 exit 15
fi fi
@@ -266,6 +268,7 @@ cmd-git-unlock() {
dokku_log_info1 "No clone folder exists app already unlocked" dokku_log_info1 "No clone folder exists app already unlocked"
fi fi
} }
cmd-git-public-key() { cmd-git-public-key() {
declare desc="outputs the dokku public deploy key" declare desc="outputs the dokku public deploy key"
local cmd="git:public-key" local cmd="git:public-key"
+2
View File
@@ -7,8 +7,10 @@ trigger-git-post-delete() {
declare desc="destroys the git properties for a given app" declare desc="destroys the git properties for a given app"
declare trigger="post-delete" declare trigger="post-delete"
declare APP="$1" declare APP="$1"
local APP_CLONE_ROOT="$DOKKU_LIB_ROOT/data/git/$APP"
fn-plugin-property-destroy "git" "$APP" fn-plugin-property-destroy "git" "$APP"
rm -rf "$APP_CLONE_ROOT"
} }
trigger-git-post-delete "$@" trigger-git-post-delete "$@"