Merge pull request #1473 from progrium/restart-crashing-apps
Handle crashing containers by using restart=on-failure policy
This commit is contained in:
commit
c1e9630052
2 files changed
+10
No files matched your search
@@ -77,6 +77,9 @@ case "$1" in
|
|||||||
DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
|
DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
|
||||||
oldids=$(get_app_container_ids $APP)
|
oldids=$(get_app_container_ids $APP)
|
||||||
|
|
||||||
|
DOKKU_RESTART_LIMIT=$(dokku config:get $APP DOKKU_RESTART_LIMIT || echo 10)
|
||||||
|
DOKKU_RESTART_LIMIT=${DOKKU_RESTART_LIMIT:=10}
|
||||||
|
|
||||||
while read line || [[ -n "$line" ]]; do
|
while read line || [[ -n "$line" ]]; do
|
||||||
TRIM=${line%#*}
|
TRIM=${line%#*}
|
||||||
PROC_TYPE=${TRIM%%=*}
|
PROC_TYPE=${TRIM%%=*}
|
||||||
@@ -91,6 +94,7 @@ case "$1" in
|
|||||||
|
|
||||||
# start the app
|
# start the app
|
||||||
DOCKER_ARGS=" -e DYNO='$PROC_TYPE.$CONTAINER_INDEX' "
|
DOCKER_ARGS=" -e DYNO='$PROC_TYPE.$CONTAINER_INDEX' "
|
||||||
|
DOCKER_ARGS=" --restart=on-failure:$DOKKU_RESTART_LIMIT"
|
||||||
DOCKER_ARGS+=$(: | plugn trigger docker-args-deploy $APP $IMAGE_TAG)
|
DOCKER_ARGS+=$(: | plugn trigger docker-args-deploy $APP $IMAGE_TAG)
|
||||||
[[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
|
[[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
|
||||||
BIND_EXTERNAL=$(plugn trigger bind-external-ip $APP)
|
BIND_EXTERNAL=$(plugn trigger bind-external-ip $APP)
|
||||||
|
|||||||
@@ -97,6 +97,12 @@ if [[ ! -s "${TMPDIR}/CHECKS" ]] || [[ "$DOKKU_APP_CONTAINER_TYPE" != "web" ]];
|
|||||||
sleep $DOKKU_DEFAULT_CHECKS_WAIT
|
sleep $DOKKU_DEFAULT_CHECKS_WAIT
|
||||||
|
|
||||||
! (is_container_running $DOKKU_APP_CONTAINER_ID) && dokku_log_fail "App container failed to start!!"
|
! (is_container_running $DOKKU_APP_CONTAINER_ID) && dokku_log_fail "App container failed to start!!"
|
||||||
|
container_restarts=$(docker inspect -f "{{ .RestartCount }}" $DOKKU_APP_CONTAINER_ID)
|
||||||
|
if [[ $container_restarts -ne 0 ]]; then
|
||||||
|
docker stop "$DOKKU_APP_CONTAINER_ID" || true
|
||||||
|
dokku_log_fail "App container failed to start!!"
|
||||||
|
fi
|
||||||
|
|
||||||
dokku_log_info1 "Default container check successful!" && exit 0
|
dokku_log_info1 "Default container check successful!" && exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user