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

* Document new Procfile feature
* Add and update tests
* Fix a typo in generate_scale_file (ref #1923)

plugins/common/functions

@@ -186,6 +186,15 @@ is_number() {
   fi
 }
 
+is_abs_path() {
+  local TEST_PATH=$1
+  if [[ "$TEST_PATH" = /* ]]; then
+      return 0
+    else
+      return 1
+  fi
+}
+
 parse_args() {
   for arg in "$@"; do
     case "$arg" in
@@ -211,6 +220,11 @@ copy_from_image() {
   verify_app_name $APP
 
   if verify_image "$IMAGE"; then
+    if ! is_abs_path $SRC_FILE; then
+      local WORKDIR=$(docker inspect -f '{{.Config.WorkingDir}}' $IMAGE)
+      [[ -z "$WORKDIR" ]] && WORKDIR=/app
+      SRC_FILE="$WORKDIR/$SRC_FILE"
+    fi
     CID=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d $IMAGE bash)
     docker cp "$CID:$SRC_FILE" "$DST_DIR"
     docker rm -f "$CID" &> /dev/null
@@ -264,6 +278,23 @@ get_app_running_container_ids() {
   echo "$APP_RUNNING_CONTAINER_IDS"
 }
 
+get_cmd_from_procfile() {
+  local APP=$1; local PROC_TYPE=$2; local DOKKU_PROCFILE="$DOKKU_ROOT/$APP/DOKKU_PROCFILE"
+  local name; local command;
+  verify_app_name $APP
+
+  if [[ -f $DOKKU_PROCFILE ]]; then
+    while read line || [[ -n "$line" ]]; do
+      if [[ -z "$line" ]] || [[ "$line" == "#"* ]]; then
+        continue
+      fi
+      name="${line%%:*}"
+      command="${line#*:[[:space:]]}"
+      [[ "$name" == "$PROC_TYPE" ]] && echo "$command" && break
+    done < $DOKKU_PROCFILE
+  fi
+}
+
 is_deployed() {
   local APP="$1"
   if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]] || [[ $(ls $DOKKU_ROOT/$APP/CONTAINER.* &> /dev/null; echo $?) -eq 0 ]]; then

plugins/ps/functions

@@ -9,8 +9,31 @@ print_dokku_scale_file() {
   done < "$DOKKU_SCALE_FILE"
 }
 
+extract_procfile() {
+  local APP="$1"
+  local IMAGE_TAG="$(get_running_image_tag $APP)"
+  local IMAGE="$(get_app_image_name $APP $IMAGE_TAG)"
+  local DOKKU_PROCFILE="$DOKKU_ROOT/$APP/DOKKU_PROCFILE"
+  verify_app_name "$APP"
+
+  copy_from_image "$IMAGE" "Procfile" "$DOKKU_PROCFILE" 2>/dev/null || true
+  if [[ -f "$DOKKU_PROCFILE" ]]; then
+    dokku_log_info1_quiet "App Procfile file found ($DOKKU_PROCFILE)"
+  else
+    dokku_log_info1_quiet "No Procfile found in app image"
+  fi
+}
+
+remove_procfile() {
+  local APP="$1"; local DOKKU_PROCFILE="$DOKKU_ROOT/$APP/DOKKU_PROCFILE"
+  if [[ -f "$DOKKU_PROCFILE" ]]; then
+    rm -f "$DOKKU_PROCFILE"
+  fi
+}
+
 generate_scale_file() {
   local APP="$1"; local IMAGE_TAG="$2"; local IMAGE=$(get_app_image_name $APP $IMAGE_TAG); local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
+  local DOKKU_PROCFILE="$DOKKU_ROOT/$APP/DOKKU_PROCFILE"
   verify_app_name "$APP"
 
   copy_from_image "$IMAGE" "/app/DOKKU_SCALE" "$DOKKU_ROOT/$APP" 2>/dev/null || true
@@ -20,18 +43,18 @@ generate_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
+    if [[ -f $DOKKU_PROCFILE ]]; then
       while read -r line || [[ -n "$line" ]]; do
-        [[ "$line" =~ ^#.* ]] && continue
+        if [[ -z "$line" ]] || [[ "$line" == "#"* ]]; then
+          continue
+        fi
         NAME=${line%%:*}
         NUM_PROCS=0
         [[ "$NAME" == "web" ]] && NUM_PROCS=1
         [[ -n "$NAME" ]] && echo "$NAME=$NUM_PROCS" >> $DOKKU_SCALE_FILE
-      done < "$PROCFILE"
+      done < $DOKKU_PROCFILE
+    else
+      echo "web=1" >> $DOKKU_SCALE_FILE
     fi
     dokku_log_info1_quiet "New DOKKU_SCALE file generated"
   else

plugins/ps/post-deploy

@@ -5,4 +5,5 @@ source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 
 APP="$1"
 
+remove_procfile "$APP"
 dokku config:set --no-restart $APP DOKKU_APP_RESTORE=1

plugins/ps/pre-deploy

@@ -5,4 +5,5 @@ source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 
 APP="$1"
 
-generate_scale_file $APP
+extract_procfile "$APP"
+generate_scale_file "$APP"