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

Merge pull request #7811 from slava-sh/fix-6939

Browse Source 
Fix issue deploying from a tar file
This commit is contained in:
Jose Diaz-Gonzalez
2025-07-23 15:54:29 -04:00
committed by GitHub
parent 77694de6ff fb405c64ab
commit 5961306813
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/git/git-from-archive
View File

@@ -42,12 +42,12 @@ trigger-git-git-from-archive() {
dokku_log_verbose "Stripping top-level archive folder components"
local subpath="$(find "$TMP_WORK_DIR_3" -mindepth 1 -maxdepth 1 -type d)"
pushd "$subpath" >/dev/null
find . -maxdepth 1 -exec mv {} "$TMP_WORK_DIR" \;
find . -mindepth 1 -maxdepth 1 -exec mv {} "$TMP_WORK_DIR" \;
popd &>/dev/null || pushd "/tmp" >/dev/null
else
dokku_log_verbose "Moving unarchived files and folders into place"
pushd "$TMP_WORK_DIR_3" >/dev/null
find . -maxdepth 1 -exec mv {} "$TMP_WORK_DIR" \;
find . -mindepth 1 -maxdepth 1 -exec mv {} "$TMP_WORK_DIR" \;
popd &>/dev/null || pushd "/tmp" >/dev/null
fi