generate DOKKU_SCALE based on Procfile if DOKKU_SCALE is not found. closes #1442
This commit is contained in:
@@ -90,10 +90,17 @@ case "$1" in
|
|||||||
DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
|
DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
|
||||||
shift 2
|
shift 2
|
||||||
|
|
||||||
generate_scale_file "$APP" "$IMAGE_TAG"
|
[[ ! -e $DOKKU_SCALE_FILE ]] && generate_scale_file "$APP" "$IMAGE_TAG"
|
||||||
if [[ -z "$@" ]]; then
|
if [[ -z "$@" ]];then
|
||||||
dokku_log_info1 "Scaling for $APP"
|
dokku_log_info1_quiet "Scaling for $APP"
|
||||||
dokku_log_info2 "$(< $DOKKU_SCALE_FILE)"
|
dokku_col_log_info1_quiet "proctype" "qty"
|
||||||
|
dokku_col_log_info1_quiet "--------" "---"
|
||||||
|
while read line || [[ -n "$line" ]]; do
|
||||||
|
[[ -z "$line" ]] && continue
|
||||||
|
PROC_NAME=${line%%=*}
|
||||||
|
PROC_COUNT=${line#*=}
|
||||||
|
dokku_col_log_info1 "$PROC_NAME" "$PROC_COUNT"
|
||||||
|
done < "$DOKKU_SCALE_FILE"
|
||||||
else
|
else
|
||||||
set_scale "$APP" "$@"
|
set_scale "$APP" "$@"
|
||||||
release_and_deploy "$APP" "$IMAGE_TAG"
|
release_and_deploy "$APP" "$IMAGE_TAG"
|
||||||
@@ -103,7 +110,7 @@ case "$1" in
|
|||||||
help | ps:help)
|
help | ps:help)
|
||||||
cat<<EOF
|
cat<<EOF
|
||||||
ps <app>, List processes running in app container(s)
|
ps <app>, List processes running in app container(s)
|
||||||
ps:scale <app> <proc>=<count> [<proc>=<count>], Set how many instances of a given process to run
|
ps:scale [<app> <proc>=<count> [<proc>=<count>]], Get/Set how many instances of a given process to run
|
||||||
ps:start <app>, Start app container(s)
|
ps:start <app>, Start app container(s)
|
||||||
ps:stop <app>, Stop app container(s)
|
ps:stop <app>, Stop app container(s)
|
||||||
ps:rebuild <app>, Rebuild an app
|
ps:rebuild <app>, Rebuild an app
|
||||||
|
|||||||
@@ -15,15 +15,29 @@ generate_scale_file() {
|
|||||||
|
|
||||||
copy_from_image "$IMAGE" "/app/DOKKU_SCALE" "$DOKKU_ROOT/$APP" 2>/dev/null || true
|
copy_from_image "$IMAGE" "/app/DOKKU_SCALE" "$DOKKU_ROOT/$APP" 2>/dev/null || true
|
||||||
if [[ ! -f $DOKKU_SCALE_FILE ]]; then
|
if [[ ! -f $DOKKU_SCALE_FILE ]]; then
|
||||||
dokku_log_info1_quiet "DOKKU_SCALE file not found in app image. Defaulting to a single web process"
|
dokku_log_info1_quiet "DOKKU_SCALE file not found in app image. Generating one based on Procfile..."
|
||||||
echo "web=1" >> $DOKKU_SCALE_FILE
|
|
||||||
|
|
||||||
|
TMP_WORK_DIR=$(mktemp -d)
|
||||||
|
trap 'rm -rf "$TMP_WORK_DIR" > /dev/null' RETURN
|
||||||
|
|
||||||
|
copy_from_image "$IMAGE" "/app/Procfile" "$TMP_WORK_DIR" 2>/dev/null || true
|
||||||
|
local PROCFILE="$TMP_WORK_DIR/Procfile"
|
||||||
|
if [[ ! -e "$PROCFILE" ]]; then
|
||||||
|
echo "web=1" >> $DOKKU_SCALE_FILE
|
||||||
|
else
|
||||||
|
while read line || [[ -n "$line" ]]; do
|
||||||
|
[[ -z "$line" ]] && continue
|
||||||
|
NAME=${line%%:*}
|
||||||
|
NUM_PROCS=0
|
||||||
|
[[ "$NAME" == "web" ]] && NUM_PROCS=1
|
||||||
|
echo "$NAME=$NUM_PROCS" >> $DOKKU_SCALE_FILE
|
||||||
|
done < "$PROCFILE"
|
||||||
|
fi
|
||||||
dokku_log_info1_quiet "New DOKKU_SCALE file generated"
|
dokku_log_info1_quiet "New DOKKU_SCALE file generated"
|
||||||
|
|
||||||
else
|
else
|
||||||
dokku_log_info1_quiet "DOKKU_SCALE file found"
|
dokku_log_info1_quiet "DOKKU_SCALE file found"
|
||||||
print_dokku_scale_file $APP
|
|
||||||
fi
|
fi
|
||||||
|
print_dokku_scale_file $APP
|
||||||
}
|
}
|
||||||
|
|
||||||
set_scale() {
|
set_scale() {
|
||||||
|
|||||||
Reference in New Issue
Block a user