Merge pull request #4651 from dokku/josegonzalez-patch-1

fix: do not attempt to retire when there was no pre-existing container
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2021-06-13 16:29:37 -04:00
commit 9c05854928
1 file changed
+5 -3
@@ -151,9 +151,11 @@ trigger-scheduler-docker-local-scheduler-deploy() {
fi fi
trap - INT TERM EXIT trap - INT TERM EXIT
# schedule old container for retirement if [[ -f "$DOKKU_CONTAINER_ID_FILE" ]]; then
dokku_log_verbose "Scheduling old container shutdown for $PROC_TYPE.$CONTAINER_INDEX in $WAIT seconds" # schedule old container for retirement
plugn trigger scheduler-register-retired "$APP" "$(cat "$DOKKU_CONTAINER_ID_FILE")" "$WAIT" dokku_log_verbose "Scheduling old container shutdown for $PROC_TYPE.$CONTAINER_INDEX in $WAIT seconds"
plugn trigger scheduler-register-retired "$APP" "$(cat "$DOKKU_CONTAINER_ID_FILE")" "$WAIT"
fi
# now using the new container # now using the new container
[[ -n "$cid" ]] && echo "$cid" >"$DOKKU_CONTAINER_ID_FILE" [[ -n "$cid" ]] && echo "$cid" >"$DOKKU_CONTAINER_ID_FILE"