github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: popd out of tmp directory after a git push-based deployment

Browse Source 
Without this, we end up with PWD issues as the tmp directory is removed automatically after a build.

Closes #6771
This commit is contained in:
Jose Diaz-Gonzalez
2024-03-28 20:53:31 -04:00
parent f4b1ce259a
commit d2cf2e7b91
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/git/functions
View File

@@ -15,7 +15,7 @@ git_build_app_repo() {
# clean up after ourselves # clean up after ourselves
local GIT_BUILD_APP_REPO_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX") local GIT_BUILD_APP_REPO_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
trap "rm -rf '$GIT_BUILD_APP_REPO_TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT trap "popd &>/dev/null || true; rm -rf '$GIT_BUILD_APP_REPO_TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT
chmod 755 "$GIT_BUILD_APP_REPO_TMP_WORK_DIR" chmod 755 "$GIT_BUILD_APP_REPO_TMP_WORK_DIR"
unset GIT_DIR GIT_QUARANTINE_PATH GIT_WORK_TREE unset GIT_DIR GIT_QUARANTINE_PATH GIT_WORK_TREE

3
plugins/scheduler-docker-local/bin/scheduler-deploy-process
View File

@@ -86,10 +86,11 @@ fn-scheduler-deploy-process() {
local CONTAINER_IDX_OFFSET=$((PROC_COUNT + 1)) local CONTAINER_IDX_OFFSET=$((PROC_COUNT + 1))
fi fi
local container_state_filetype local container_state_filetype
pushd "$DOKKU_ROOT/$APP" >/dev/null
for container_state_filetype in CONTAINER IP PORT; do for container_state_filetype in CONTAINER IP PORT; do
cd "$DOKKU_ROOT/$APP"
find . -maxdepth 1 -name "$container_state_filetype.$PROC_TYPE.*" -printf "%f\n" | sort -t . -k 3 -n | tail -n +$CONTAINER_IDX_OFFSET | xargs rm -f find . -maxdepth 1 -name "$container_state_filetype.$PROC_TYPE.*" -printf "%f\n" | sort -t . -k 3 -n | tail -n +$CONTAINER_IDX_OFFSET | xargs rm -f
done done
popd &>/dev/null || pushd "/tmp" >/dev/null
} }
main() { main() {