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

refactor: move helper function to internal-functions

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2021-08-12 21:11:11 -04:00
parent c4985bca67
commit 6c6e26712d
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/scheduler-docker-local/internal-functions
View File

@@ -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[@]}"
}

12
plugins/scheduler-docker-local/scheduler-deploy
View File

@@ -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 "$@"