Merge pull request #3408 from dokku/container-restart-no
Disable container restarts for stopped containers
This commit is contained in:
@@ -121,6 +121,7 @@ scheduler-docker-local-check-deploy() {
|
|||||||
! (is_container_status "$DOKKU_APP_CONTAINER_ID" "Running") && dokku_log_fail "App container failed to start!!"
|
! (is_container_status "$DOKKU_APP_CONTAINER_ID" "Running") && dokku_log_fail "App container failed to start!!"
|
||||||
local container_restarts="$(docker inspect -f "{{ .RestartCount }}" "$DOKKU_APP_CONTAINER_ID")"
|
local container_restarts="$(docker inspect -f "{{ .RestartCount }}" "$DOKKU_APP_CONTAINER_ID")"
|
||||||
if [[ $container_restarts -ne 0 ]]; then
|
if [[ $container_restarts -ne 0 ]]; then
|
||||||
|
docker container update --restart=no "$DOKKU_APP_CONTAINER_ID" &>/dev/null || true
|
||||||
docker stop "$DOKKU_APP_CONTAINER_ID" || true
|
docker stop "$DOKKU_APP_CONTAINER_ID" || true
|
||||||
dokku_log_fail "App container failed to start!!"
|
dokku_log_fail "App container failed to start!!"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -48,6 +48,10 @@ scheduler-docker-local-scheduler-deploy() {
|
|||||||
local cid proctype_oldids="$(get_app_running_container_ids "$APP" "$PROC_TYPE")"
|
local cid proctype_oldids="$(get_app_running_container_ids "$APP" "$PROC_TYPE")"
|
||||||
for cid in $proctype_oldids; do
|
for cid in $proctype_oldids; do
|
||||||
dokku_log_info2 "stopping $APP.$PROC_TYPE ($cid)"
|
dokku_log_info2 "stopping $APP.$PROC_TYPE ($cid)"
|
||||||
|
|
||||||
|
# Disable the container restart policy
|
||||||
|
docker container update --restart=no "$cid" &>/dev/null || true
|
||||||
|
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
docker stop $DOCKER_STOP_TIME_ARG "$cid" &>/dev/null
|
docker stop $DOCKER_STOP_TIME_ARG "$cid" &>/dev/null
|
||||||
# remove cid from oldids to skip the old container finish processing
|
# remove cid from oldids to skip the old container finish processing
|
||||||
@@ -107,7 +111,11 @@ scheduler-docker-local-scheduler-deploy() {
|
|||||||
declare CID="$1" PROC_TYPE="$2" CONTAINER_INDEX="$3"
|
declare CID="$1" PROC_TYPE="$2" CONTAINER_INDEX="$3"
|
||||||
mkdir -p "${DOKKU_LIB_ROOT}/data/scheduler-docker-local/$APP"
|
mkdir -p "${DOKKU_LIB_ROOT}/data/scheduler-docker-local/$APP"
|
||||||
echo "${CID} ${PROC_TYPE}.${CONTAINER_INDEX}" >>"${DOKKU_LIB_ROOT}/data/scheduler-docker-local/$APP/failed-containers"
|
echo "${CID} ${PROC_TYPE}.${CONTAINER_INDEX}" >>"${DOKKU_LIB_ROOT}/data/scheduler-docker-local/$APP/failed-containers"
|
||||||
docker inspect "$CID" &>/dev/null && docker stop "$CID" >/dev/null && docker kill "$CID" &>/dev/null
|
docker inspect "$CID" &>/dev/null && {
|
||||||
|
# Disable the container restart policy
|
||||||
|
docker container update --restart=no "$CID" &>/dev/null || true
|
||||||
|
docker stop "$CID" >/dev/null && docker kill "$CID" &>/dev/null
|
||||||
|
}
|
||||||
trap - INT TERM EXIT
|
trap - INT TERM EXIT
|
||||||
kill -9 $$
|
kill -9 $$
|
||||||
}
|
}
|
||||||
@@ -169,6 +177,9 @@ scheduler-docker-local-scheduler-deploy() {
|
|||||||
trap '' INT HUP
|
trap '' INT HUP
|
||||||
sleep "$WAIT"
|
sleep "$WAIT"
|
||||||
for oldid in $oldids; do
|
for oldid in $oldids; do
|
||||||
|
# Disable the container restart policy
|
||||||
|
docker container update --restart=no "$oldid" &>/dev/null || true
|
||||||
|
|
||||||
# Attempt to stop, if that fails, then force a kill as docker seems
|
# Attempt to stop, if that fails, then force a kill as docker seems
|
||||||
# to not send SIGKILL as the docs would indicate. If that fails, move
|
# to not send SIGKILL as the docs would indicate. If that fails, move
|
||||||
# on to the next.
|
# on to the next.
|
||||||
|
|||||||
@@ -19,6 +19,10 @@ scheduler-docker-local-scheduler-stop() {
|
|||||||
[[ -n "$DOKKU_DOCKER_STOP_TIMEOUT" ]] && DOCKER_STOP_TIME_ARG="--time=${DOKKU_DOCKER_STOP_TIMEOUT}"
|
[[ -n "$DOKKU_DOCKER_STOP_TIMEOUT" ]] && DOCKER_STOP_TIME_ARG="--time=${DOKKU_DOCKER_STOP_TIMEOUT}"
|
||||||
|
|
||||||
if [[ -n "$DOKKU_APP_RUNNING_CONTAINER_IDS" ]]; then
|
if [[ -n "$DOKKU_APP_RUNNING_CONTAINER_IDS" ]]; then
|
||||||
|
# Disable the container restart policy
|
||||||
|
# shellcheck disable=SC2086
|
||||||
|
docker container update --restart=no $DOKKU_APP_RUNNING_CONTAINER_IDS &>/dev/null || true
|
||||||
|
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
docker stop $DOCKER_STOP_TIME_ARG $DOKKU_APP_RUNNING_CONTAINER_IDS >/dev/null || true
|
docker stop $DOCKER_STOP_TIME_ARG $DOKKU_APP_RUNNING_CONTAINER_IDS >/dev/null || true
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user