From e8a532645ffb253dcaded435f9315942866adfcc Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 28 Nov 2020 00:38:28 -0500 Subject: [PATCH] fix: handle case where container does not exist during retire step This ma happen during app renames, as the old versions of the containers will no longer be running. --- plugins/scheduler-docker-local/scheduler-register-retired | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/scheduler-docker-local/scheduler-register-retired b/plugins/scheduler-docker-local/scheduler-register-retired index f0e520d26..14e355b9b 100755 --- a/plugins/scheduler-docker-local/scheduler-register-retired +++ b/plugins/scheduler-docker-local/scheduler-register-retired @@ -9,10 +9,12 @@ trigger-scheduler-docker-local-scheduler-register-retired() { declare APP="$1" CONTAINER_ID="$2" WAIT="${3:-60}" local IMAGE_ID - IMAGE_ID="$("$DOCKER_BIN" container inspect "$CONTAINER_ID" --format "{{.Image}}" | cut -d: -f2)" - fn-scheduler-docker-local-register-retired "image" "$APP" "$IMAGE_ID" "$WAIT" + IMAGE_ID="$("$DOCKER_BIN" container inspect "$CONTAINER_ID" --format "{{.Image}}" 2>/dev/null | cut -d: -f2 || true)" fn-scheduler-docker-local-register-retired "container" "$APP" "$CONTAINER_ID" "$WAIT" + if [[ -z "$IMAGE_ID" ]]; then + fn-scheduler-docker-local-register-retired "image" "$APP" "$IMAGE_ID" "$WAIT" + fi } trigger-scheduler-docker-local-scheduler-register-retired "$@"