refactor: simplify container creation call
This commit is contained in:
@@ -17,7 +17,7 @@ trigger-scheduler-docker-local-scheduler-deploy() {
|
|||||||
|
|
||||||
rm -f "${DOKKU_LIB_ROOT}/data/scheduler-docker-local/$APP/failed-containers"
|
rm -f "${DOKKU_LIB_ROOT}/data/scheduler-docker-local/$APP/failed-containers"
|
||||||
|
|
||||||
local DOCKER_RUN_LABEL_ARGS="--label=com.dokku.app-name=$APP"
|
local DOCKER_RUN_LABEL_ARGS="--label=com.dokku.app-name=$APP --label=com.dokku.container-type=deploy"
|
||||||
local DOKKU_DOCKER_STOP_TIMEOUT DOKKU_HEROKUISH DOKKU_NETWORK_BIND_ALL IMAGE
|
local DOKKU_DOCKER_STOP_TIMEOUT DOKKU_HEROKUISH DOKKU_NETWORK_BIND_ALL IMAGE
|
||||||
DOKKU_HEROKUISH=false
|
DOKKU_HEROKUISH=false
|
||||||
IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
|
IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
|
||||||
@@ -72,43 +72,37 @@ trigger-scheduler-docker-local-scheduler-deploy() {
|
|||||||
# start the app
|
# start the app
|
||||||
local DOCKER_ARGS
|
local DOCKER_ARGS
|
||||||
DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG" "$PROC_TYPE" "$CONTAINER_INDEX")
|
DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG" "$PROC_TYPE" "$CONTAINER_INDEX")
|
||||||
|
DOCKER_ARGS+=" --label=com.dokku.process-type=$PROC_TYPE --label=com.dokku.dyno=$DYNO "
|
||||||
DOCKER_ARGS+=" -e DYNO=$DYNO "
|
DOCKER_ARGS+=" -e DYNO=$DYNO "
|
||||||
|
DOCKER_ARGS+=" --init "
|
||||||
|
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")
|
DOCKER_ARGS+=$(: | plugn trigger docker-args-process-deploy "$APP" "$IMAGE_SOURCE_TYPE" "$IMAGE_TAG" "$PROC_TYPE" "$CONTAINER_INDEX")
|
||||||
[[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
|
[[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
|
||||||
|
|
||||||
declare -a ARG_ARRAY
|
|
||||||
eval "ARG_ARRAY=($DOCKER_ARGS)"
|
|
||||||
|
|
||||||
local START_CMD
|
local START_CMD
|
||||||
[[ "$DOKKU_HEROKUISH" == "true" ]] && START_CMD="/start $PROC_TYPE"
|
[[ "$DOKKU_HEROKUISH" == "true" ]] && START_CMD="/start $PROC_TYPE"
|
||||||
[[ -n "$DOKKU_START_CMD" ]] && START_CMD="$DOKKU_START_CMD"
|
[[ -n "$DOKKU_START_CMD" ]] && START_CMD="$DOKKU_START_CMD"
|
||||||
|
|
||||||
|
local DOKKU_PORT=""
|
||||||
if [[ "$PROC_TYPE" == "web" ]]; then
|
if [[ "$PROC_TYPE" == "web" ]]; then
|
||||||
ports=($(plugn trigger network-compute-ports "$APP" "$PROC_TYPE" "$DOKKU_HEROKUISH" "$CONTAINER_INDEX"))
|
ports=($(plugn trigger network-compute-ports "$APP" "$PROC_TYPE" "$DOKKU_HEROKUISH" "$CONTAINER_INDEX"))
|
||||||
local DOKKU_DOCKER_PORT_ARGS=""
|
local DOKKU_DOCKER_PORT_ARGS=""
|
||||||
local DOKKU_PORT=""
|
|
||||||
for p in "${ports[@]}"; do
|
for p in "${ports[@]}"; do
|
||||||
if [[ ! "$p" =~ .*udp.* ]]; then
|
if [[ ! "$p" =~ .*udp.* ]]; then
|
||||||
DOKKU_PORT=${DOKKU_PORT:="$p"}
|
DOKKU_PORT=${DOKKU_PORT:="$p"}
|
||||||
fi
|
fi
|
||||||
DOKKU_DOCKER_PORT_ARGS+=" -p $p "
|
|
||||||
|
if [[ "$DOKKU_NETWORK_BIND_ALL" == "true" ]]; then
|
||||||
|
DOCKER_ARGS+=" -p $p "
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
START_CMD=$(fn-scheduler-docker-local-extract-start-cmd "$APP" "$PROC_TYPE" "$START_CMD" "$DOKKU_HEROKUISH" "$DOKKU_PORT")
|
|
||||||
if [[ "$DOKKU_NETWORK_BIND_ALL" == "false" ]]; then
|
|
||||||
# shellcheck disable=SC2086
|
|
||||||
cid=$("$DOCKER_BIN" container create --label=com.dokku.container-type=deploy --label=com.dokku.process-type=$PROC_TYPE --label=com.dokku.dyno=$DYNO "${DOCKER_RUN_LABEL_ARGS[@]}" $DOKKU_GLOBAL_RUN_ARGS --init --env PORT=$DOKKU_PORT "${ARG_ARRAY[@]}" $IMAGE $START_CMD)
|
|
||||||
else
|
|
||||||
# shellcheck disable=SC2086
|
|
||||||
cid=$("$DOCKER_BIN" container create --label=com.dokku.container-type=deploy --label=com.dokku.process-type=$PROC_TYPE --label=com.dokku.dyno=$DYNO "${DOCKER_RUN_LABEL_ARGS[@]}" $DOKKU_GLOBAL_RUN_ARGS --init $DOKKU_DOCKER_PORT_ARGS --env PORT=$DOKKU_PORT "${ARG_ARRAY[@]}" $IMAGE $START_CMD)
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
START_CMD=$(fn-scheduler-docker-local-extract-start-cmd "$APP" "$PROC_TYPE" "$START_CMD" "$DOKKU_HEROKUISH")
|
|
||||||
|
|
||||||
# shellcheck disable=SC2086
|
|
||||||
cid=$("$DOCKER_BIN" container create --label=com.dokku.container-type=deploy --label=com.dokku.process-type=$PROC_TYPE --label=com.dokku.dyno=$DYNO "${DOCKER_RUN_LABEL_ARGS[@]}" $DOKKU_GLOBAL_RUN_ARGS --init --env PORT=$DOKKU_PORT "${ARG_ARRAY[@]}" $IMAGE $START_CMD)
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
DOCKER_ARGS+=" --env PORT=$DOKKU_PORT "
|
||||||
|
START_CMD=$(fn-scheduler-docker-local-extract-start-cmd "$APP" "$PROC_TYPE" "$START_CMD" "$DOKKU_HEROKUISH" "$DOKKU_PORT")
|
||||||
|
# shellcheck disable=SC2086
|
||||||
|
cid=$("$DOCKER_BIN" container create $DOCKER_ARGS $IMAGE $START_CMD)
|
||||||
|
|
||||||
plugn trigger post-container-create "app" "$cid" "$APP" "deploy" "$PROC_TYPE"
|
plugn trigger post-container-create "app" "$cid" "$APP" "deploy" "$PROC_TYPE"
|
||||||
"$DOCKER_BIN" container start "$cid" >/dev/null || true
|
"$DOCKER_BIN" container start "$cid" >/dev/null || true
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user