Merge pull request #5015 from dokku/5012-clone-fixes

Avoid popd errors when dokku is run as root
2022-01-28 11:34:16 -05:00
parent faf204c03a b0faf2e1f2
commit c42916c027
2 changed files with 2 additions and 2 deletions
--- a/plugins/builder-dockerfile/core-post-extract
+++ b/plugins/builder-dockerfile/core-post-extract
@@ -26,7 +26,7 @@ trigger-builder-dockerfile-core-post-extract() {
  fi

  mv "$NEW_DOCKERFILE" Dockerfile
-  popd &>/dev/null
+  popd &>/dev/null || pushd "/tmp" >/dev/null
 }

 trigger-builder-dockerfile-core-post-extract "$@"
--- a/plugins/builder-pack/core-post-extract
+++ b/plugins/builder-pack/core-post-extract
@@ -24,7 +24,7 @@ trigger-builder-pack-core-post-extract() {
  if [[ "$NEW_PROJECT_TOML" != "project.toml" ]]; then
    mv "$NEW_PROJECT_TOML" project.toml
  fi
-  popd &>/dev/null
+  popd &>/dev/null || pushd "/tmp" >/dev/null
 }

 trigger-builder-pack-core-post-extract "$@"