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

chore: standardize on writing to file versus a destination

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2019-08-01 19:32:04 -04:00
parent 0567bfd65d
commit d326c17dfb
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/app-json/internal-functions
View File

@@ -12,7 +12,7 @@ get_phase_script() {
local APP_JSON_FILE="$GET_PHASE_SCRIPT_TMP_WORK_DIR/app.json" 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 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 if [[ ! -f "$APP_JSON_FILE" ]]; then
return 0 return 0

4
plugins/nginx-vhosts/functions
View File

@@ -185,12 +185,12 @@ get_custom_nginx_template() {
declare desc="attempts to copy custom nginx template from app image" declare desc="attempts to copy custom nginx template from app image"
local APP="$1" local APP="$1"
verify_app_name "$APP" verify_app_name "$APP"
local DESTINATION="$2" local DESTINATION_FILE="$2"
local IMAGE_TAG="$(get_running_image_tag "$APP")" local IMAGE_TAG="$(get_running_image_tag "$APP")"
local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG") local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
local NGINX_TEMPLATE_NAME="nginx.conf.sigil" 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() { is_spdy_enabled() {

2
plugins/ps/functions
View File

@@ -62,7 +62,7 @@ generate_scale_file() {
local DOKKU_PROCFILE="$DOKKU_ROOT/$APP/DOKKU_PROCFILE" local DOKKU_PROCFILE="$DOKKU_ROOT/$APP/DOKKU_PROCFILE"
verify_app_name "$APP" 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" cp "$DOKKU_SCALE_FILE" "${DOKKU_SCALE_FILE}.extracted"
else else
rm -f "${DOKKU_SCALE_FILE}.extracted" rm -f "${DOKKU_SCALE_FILE}.extracted"