Merge pull request #3100 from dokku/2991-skip-merge-conflicts

Properly handle invalid process type entries during DOKKU_SCALE generation
2018-03-08 00:48:35 -05:00
parent eb6872d533 71b578bf10
commit 512878f629
1 changed files with 1 additions and 1 deletions
--- a/plugins/ps/functions
+++ b/plugins/ps/functions
@@ -58,7 +58,7 @@ generate_scale_file() {
        local NUM_PROCS=0
        [[ "$NAME" == "web" ]] && NUM_PROCS=1
        [[ -n "$NAME" ]] && echo "$NAME=$NUM_PROCS" >> "$DOKKU_SCALE_FILE"
-      done < "$DOKKU_PROCFILE"
+      done < <(egrep -v "^#" "$DOKKU_PROCFILE" | grep ':' | awk -F ':' '{ print $1 }' | sort | uniq)
    else
      echo "web=1" >> "$DOKKU_SCALE_FILE"
    fi