From 51c5c58354c251c5176415a0c72bb8e820b8503d Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 6 Oct 2021 02:03:39 -0400 Subject: [PATCH] fix: do not attempt to move the Dockerfile if it is the default path Also drop the unnecessary rm call --- plugins/builder-dockerfile/core-post-extract | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/builder-dockerfile/core-post-extract b/plugins/builder-dockerfile/core-post-extract index 16625f35f..c25d64b63 100755 --- a/plugins/builder-dockerfile/core-post-extract +++ b/plugins/builder-dockerfile/core-post-extract @@ -16,15 +16,16 @@ trigger-builder-dockerfile-core-post-extract() { return fi - if [[ ! -f "$NEW_DOCKERFILE" ]]; then - dokku_log_fail "Invalid dockerfile-path specified: $NEW_DOCKERFILE" - rm -f Dockerfile + if [[ "$NEW_DOCKERFILE" == "Dockerfile" ]]; then return fi - if [[ "$NEW_DOCKERFILE" != "Dockerfile" ]]; then - mv "$NEW_DOCKERFILE" Dockerfile + if [[ ! -f "$NEW_DOCKERFILE" ]]; then + dokku_log_fail "Invalid dockerfile-path specified: $NEW_DOCKERFILE" + return fi + + mv "$NEW_DOCKERFILE" Dockerfile popd &>/dev/null }