From c4c6ac5617abcb5c8d82d8d2550ded7704e3db41 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Wed, 10 Aug 2022 21:27:25 -0400
Subject: [PATCH] feat: add the ability to disable the init process

This allows projects using s6 overlay - in particular linxserver images - the ability to disable --init flag injection.

Closes #5287
---
 docs/deployment/schedulers/docker-local.md         | 14 ++++++++++++++
 .../bin/scheduler-deploy-process                   |  1 +
 .../bin/scheduler-deploy-process-container         |  4 +++-
 plugins/scheduler-docker-local/internal-functions  |  1 +
 plugins/scheduler-docker-local/subcommands/set     |  4 ++--
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/docs/deployment/schedulers/docker-local.md b/docs/deployment/schedulers/docker-local.md
index 5d50da590..da9039a79 100644
--- a/docs/deployment/schedulers/docker-local.md
+++ b/docs/deployment/schedulers/docker-local.md
@@ -37,6 +37,20 @@ Once set, you may re-enable it by setting a blank value for `disable-chown`:
 dokku scheduler-docker-local:set node-js-app disable-chown
 ```
 
+### Disabling the init process
+
+The `scheduler-docker-local` injects an init process by default via the `--init`. For some apps - such as those where the built docker image uses S6 as the init - this may be undesirable and cause issues with process starts. You may disable this by running the following `scheduler-docker-local:set` command for your application:
+
+```shell
+dokku scheduler-docker-local:set node-js-app init-process false
+```
+
+Once set, you may re-enable it by setting a blank value for `init-process`:
+
+```shell
+dokku scheduler-docker-local:set node-js-app init-process
+```
+
 ### Deploying Process Types in Parallel
 
 > New as of 0.25.5
diff --git a/plugins/scheduler-docker-local/bin/scheduler-deploy-process b/plugins/scheduler-docker-local/bin/scheduler-deploy-process
index 208b337ff..68b0eac5d 100755
--- a/plugins/scheduler-docker-local/bin/scheduler-deploy-process
+++ b/plugins/scheduler-docker-local/bin/scheduler-deploy-process
@@ -35,6 +35,7 @@ main() {
     CONTAINER_INDEX=$((CONTAINER_INDEX + 1))
   done
 
+  INJECT_INIT_FLAG="$(fn-plugin-property-get "scheduler-docker-local" "$APP" "init-process" "true")"
   PARALLEL_DEPLOY_COUNT="$(plugn trigger "app-json-process-deploy-parallelism" "$APP" "$PROC_TYPE")"
   DOKKU_CHECKS_DISABLED="$DOKKU_CHECKS_DISABLED" parallel --will-cite --halt soon,fail=1 --jobs "$PARALLEL_DEPLOY_COUNT" --ungroup <"$PROCESS_TMP_FILE"
 
diff --git a/plugins/scheduler-docker-local/bin/scheduler-deploy-process-container b/plugins/scheduler-docker-local/bin/scheduler-deploy-process-container
index 2804678c6..bfa442dc6 100755
--- a/plugins/scheduler-docker-local/bin/scheduler-deploy-process-container
+++ b/plugins/scheduler-docker-local/bin/scheduler-deploy-process-container
@@ -19,7 +19,9 @@ main() {
   DOCKER_ARGS+=" --label=com.dokku.process-type=$PROC_TYPE --label=com.dokku.dyno=$DYNO"
   DOCKER_ARGS+=" --env=DYNO=$DYNO"
   DOCKER_ARGS+=" --name=$APP.$DYNO.upcoming-$RANDOM"
-  DOCKER_ARGS+=" --init"
+  if [[ "$INJECT_INIT_FLAG" == "false" ]]; then
+    DOCKER_ARGS+=" --init"
+  fi
   DOCKER_ARGS+=" $DOCKER_RUN_LABEL_ARGS $DOKKU_GLOBAL_RUN_ARGS "
   DOCKER_ARGS+=$(: | plugn trigger docker-args-process-deploy "$APP" "$IMAGE_SOURCE_TYPE" "$IMAGE_TAG" "$PROC_TYPE" "$CONTAINER_INDEX")
   [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" --env=TRACE=true"
diff --git a/plugins/scheduler-docker-local/internal-functions b/plugins/scheduler-docker-local/internal-functions
index b841d4582..1a44deae9 100755
--- a/plugins/scheduler-docker-local/internal-functions
+++ b/plugins/scheduler-docker-local/internal-functions
@@ -37,6 +37,7 @@ cmd-scheduler-docker-local-report-single() {
   verify_app_name "$APP"
   local flag_map=(
     "--scheduler-docker-local-disable-chown: $(fn-plugin-property-get "scheduler-docker-local" "$APP" "disable-chown" "")"
+    "--scheduler-docker-local-init-process: $(fn-plugin-property-get "scheduler-docker-local" "$APP" "init-process" "true")"
     "--scheduler-docker-local-parallel-schedule-count: $(fn-plugin-property-get "scheduler-docker-local" "$APP" "parallel-schedule-count" "")"
   )
 
diff --git a/plugins/scheduler-docker-local/subcommands/set b/plugins/scheduler-docker-local/subcommands/set
index dcb1f7f91..8f2230126 100755
--- a/plugins/scheduler-docker-local/subcommands/set
+++ b/plugins/scheduler-docker-local/subcommands/set
@@ -9,13 +9,13 @@ cmd-scheduler-docker-local-set() {
   declare cmd="scheduler-docker-local:set"
   [[ "$1" == "$cmd" ]] && shift 1
   declare APP="$1" KEY="$2" VALUE="$3"
-  local VALID_KEYS=("disable-chown" "parallel-schedule-count")
+  local VALID_KEYS=("disable-chown" "init-process" "parallel-schedule-count")
   verify_app_name "$APP"
 
   [[ -z "$KEY" ]] && dokku_log_fail "No key specified"
 
   if ! fn-in-array "$KEY" "${VALID_KEYS[@]}"; then
-    dokku_log_fail "Invalid key specified, valid keys include: disable-chown, parallel-schedule-count"
+    dokku_log_fail "Invalid key specified, valid keys include: disable-chown, init-process, parallel-schedule-count"
   fi
 
   if [[ -n "$VALUE" ]]; then