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

Fix #1564: Use Procfile for process types in Dockerfile apps

Browse Source 
* Document new Procfile feature
* Add and update tests
* Fix a typo in generate_scale_file (ref #1923)
This commit is contained in:
Paul McLanahan
2016-02-14 15:37:24 -05:00
committed by Jose Diaz-Gonzalez
parent 8e297cd38e
commit 6a01abb905
16 changed files with 292 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dokku
View File

@@ -137,7 +137,9 @@ case "$1" in
if [[ -z "$DOKKU_HEROKUISH" ]]; then
DOKKU_DOCKERFILE_PORT=$(dokku config:get $APP DOKKU_DOCKERFILE_PORT || true)
START_CMD=$(dokku config:get $APP DOKKU_DOCKERFILE_START_CMD || $START_CMD)
DOKKU_DOCKERFILE_START_CMD=$(dokku config:get $APP DOKKU_DOCKERFILE_START_CMD || true)
DOKKU_PROCFILE_START_CMD=$(get_cmd_from_procfile $APP $PROC_TYPE)
START_CMD=${DOKKU_DOCKERFILE_START_CMD:-$DOKKU_PROCFILE_START_CMD}
fi
if [[ "$PROC_TYPE" == "web" ]]; then