diff --git a/plugins/scheduler-docker-local/internal-functions b/plugins/scheduler-docker-local/internal-functions index d8355137a..889509c05 100755 --- a/plugins/scheduler-docker-local/internal-functions +++ b/plugins/scheduler-docker-local/internal-functions @@ -235,3 +235,13 @@ fn-scheduler-docker-local-register-retired() { echo "${APP} ${DOCKER_ID} ${DEAD_TIME}" >>"${DEAD_FILE}" fi } + +fn-scheduler-docker-local-start-app-container() { + declare desc="starts a single app container" + declare APP="$1" DOCKER_ARGS="$2" + + declare -a __DOKKU_DOCKER_ARG_ARRAY + eval "__DOKKU_DOCKER_ARG_ARRAY=($DOCKER_ARGS)" + eval "$(config_export app "$APP" --merged)" + "$DOCKER_BIN" container create "${__DOKKU_DOCKER_ARG_ARRAY[@]}" +} diff --git a/plugins/scheduler-docker-local/scheduler-deploy b/plugins/scheduler-docker-local/scheduler-deploy index 1a878faad..50c51f04d 100755 --- a/plugins/scheduler-docker-local/scheduler-deploy +++ b/plugins/scheduler-docker-local/scheduler-deploy @@ -115,7 +115,7 @@ trigger-scheduler-docker-local-scheduler-deploy() { DOCKER_ARGS+=" $IMAGE " DOCKER_ARGS+=" $START_CMD " - cid=$(fn-start-app-container "$DOCKER_ARGS") + cid=$(fn-scheduler-docker-local-start-app-container "$APP" "$DOCKER_ARGS") plugn trigger post-container-create "app" "$cid" "$APP" "deploy" "$PROC_TYPE" "$DOCKER_BIN" container start "$cid" >/dev/null || true @@ -222,14 +222,4 @@ fn-scheduler-docker-local-extract-start-cmd() { echo "$START_CMD" } -fn-start-app-container() { - declare desc="starts a single app container" - declare DOCKER_ARGS="$1" - - declare -a __DOKKU_DOCKER_ARG_ARRAY - eval "__DOKKU_DOCKER_ARG_ARRAY=($DOCKER_ARGS)" - eval "$(config_export app "$APP" --merged)" - "$DOCKER_BIN" container create "${__DOKKU_DOCKER_ARG_ARRAY[@]}" -} - trigger-scheduler-docker-local-scheduler-deploy "$@"