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

default web proc. avoid unclear file not found error when procfile is missing

Browse Source
This commit is contained in:
Michael Hobbs
2015-04-18 10:38:07 -07:00
parent 435f7e69eb
commit d5cc7595fd
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/ps/functions
View File

@@ -6,7 +6,7 @@ generate_scale_file() {
local APP="$1"; local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE" local APP="$1"; local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
copy_from_image "$APP" "/app/DOKKU_SCALE" "$DOKKU_ROOT/$APP" 2>/dev/null || dokku_log_info1_quiet "DOKKU_SCALE not found in app image" copy_from_image "$APP" "/app/DOKKU_SCALE" "$DOKKU_ROOT/$APP" 2>/dev/null || dokku_log_info1_quiet "DOKKU_SCALE not found in app image"
if [[ ! -f $DOKKU_SCALE_FILE ]]; then if [[ ! -f $DOKKU_SCALE_FILE ]]; then
local TMP_WORK_DIR=$(mktemp -d DOKKU_SCALE.XXXXX) local TMP_WORK_DIR=$(mktemp --tmpdir=/tmp -d DOKKU_SCALE.XXXXX)
trap 'rm -rf $TMP_WORK_DIR' EXIT trap 'rm -rf $TMP_WORK_DIR' EXIT
copy_from_image "$APP" /app/Procfile $TMP_WORK_DIR 2>/dev/null || true copy_from_image "$APP" /app/Procfile $TMP_WORK_DIR 2>/dev/null || true
@@ -17,16 +17,18 @@ generate_scale_file() {
elif [[ -f $TMP_WORK_DIR/.release ]];then elif [[ -f $TMP_WORK_DIR/.release ]];then
local PROCFILE="$TMP_WORK_DIR/.release" local PROCFILE="$TMP_WORK_DIR/.release"
else else
echo "default=1" >> $DOKKU_SCALE_FILE echo "web=1" >> $DOKKU_SCALE_FILE
fi fi
while read line || [ -n "$line" ] if [[ -f $PROCFILE ]]; then
do while read line || [ -n "$line" ]
local PROC_NAME=${line%%:*} do
local PROC_CMD=${line#*:} local PROC_NAME=${line%%:*}
[[ "$PROC_NAME" =~ -.* ]] && continue local PROC_CMD=${line#*:}
[[ -n "$PROC_CMD" ]] && echo "$PROC_NAME=1" >> $DOKKU_SCALE_FILE [[ "$PROC_NAME" =~ -.* ]] && continue
done < "$PROCFILE" [[ -n "$PROC_CMD" ]] && echo "$PROC_NAME=1" >> $DOKKU_SCALE_FILE
done < "$PROCFILE"
fi
dokku_log_info1_quiet "New DOKKU_SCALE file generated" dokku_log_info1_quiet "New DOKKU_SCALE file generated"
dokku_log_info1_quiet "$(< $DOKKU_SCALE_FILE)" dokku_log_info1_quiet "$(< $DOKKU_SCALE_FILE)"