diff --git a/plugins/app-json/internal-functions b/plugins/app-json/internal-functions index 939194235..9652cec02 100755 --- a/plugins/app-json/internal-functions +++ b/plugins/app-json/internal-functions @@ -12,7 +12,7 @@ get_phase_script() { local APP_JSON_FILE="$GET_PHASE_SCRIPT_TMP_WORK_DIR/app.json" trap "rm -rf '$GET_PHASE_SCRIPT_TMP_WORK_DIR' >/dev/null" RETURN INT TERM - copy_from_image "$IMAGE" "app.json" "$GET_PHASE_SCRIPT_TMP_WORK_DIR" 2>/dev/null || true + copy_from_image "$IMAGE" "app.json" "$APP_JSON_FILE" 2>/dev/null || true if [[ ! -f "$APP_JSON_FILE" ]]; then return 0 diff --git a/plugins/nginx-vhosts/functions b/plugins/nginx-vhosts/functions index 6de04743f..5254394da 100755 --- a/plugins/nginx-vhosts/functions +++ b/plugins/nginx-vhosts/functions @@ -185,12 +185,12 @@ get_custom_nginx_template() { declare desc="attempts to copy custom nginx template from app image" local APP="$1" verify_app_name "$APP" - local DESTINATION="$2" + local DESTINATION_FILE="$2" local IMAGE_TAG="$(get_running_image_tag "$APP")" local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG") local NGINX_TEMPLATE_NAME="nginx.conf.sigil" - copy_from_image "$IMAGE" "$NGINX_TEMPLATE_NAME" "$DESTINATION" 2>/dev/null || true + copy_from_image "$IMAGE" "$NGINX_TEMPLATE_NAME" "$DESTINATION_FILE" 2>/dev/null || true } is_spdy_enabled() { diff --git a/plugins/ps/functions b/plugins/ps/functions index fe0cb0ca4..5cee618b7 100755 --- a/plugins/ps/functions +++ b/plugins/ps/functions @@ -62,7 +62,7 @@ generate_scale_file() { local DOKKU_PROCFILE="$DOKKU_ROOT/$APP/DOKKU_PROCFILE" verify_app_name "$APP" - if copy_from_image "$IMAGE" "DOKKU_SCALE" "$DOKKU_ROOT/$APP" >/dev/null 2>&1; then + if copy_from_image "$IMAGE" "DOKKU_SCALE" "$DOKKU_SCALE_FILE" >/dev/null 2>&1; then cp "$DOKKU_SCALE_FILE" "${DOKKU_SCALE_FILE}.extracted" else rm -f "${DOKKU_SCALE_FILE}.extracted"