From b0faf2e1f2d12b7b1973d4c8b7132e0a543ba4ad Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 27 Jan 2022 22:14:14 -0500 Subject: [PATCH] fix: avoid popd errors when dokku is run as root When running the dokku command in a directory that the dokku user does not have access to - such as /root - popd will fail loudly (starting in Ubuntu 16.04). This change ignores those errors and changes the working dir in the bin to /tmp. Refs #5012 --- plugins/builder-dockerfile/core-post-extract | 2 +- plugins/builder-pack/core-post-extract | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/builder-dockerfile/core-post-extract b/plugins/builder-dockerfile/core-post-extract index c25d64b63..c121c86bb 100755 --- 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 "$@" diff --git a/plugins/builder-pack/core-post-extract b/plugins/builder-pack/core-post-extract index a3fe85b95..4c50479e2 100755 --- 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 "$@"