From 7a564f318538afd84de18df644f115b0e98eaeb1 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 8 Aug 2021 02:24:27 -0400 Subject: [PATCH] fix: do not retire the original image By removing the image cleanup registration, we avoid cases where we delete gliderlabs/herokuish, which may cause issues for users in airgapped installations (where the image may not be pullable from a registry). --- plugins/builder-herokuish/builder-build | 2 +- plugins/scheduler-docker-local/scheduler-register-retired | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/builder-herokuish/builder-build b/plugins/builder-herokuish/builder-build index 74d989cc7..f134583b8 100755 --- a/plugins/builder-herokuish/builder-build +++ b/plugins/builder-herokuish/builder-build @@ -41,7 +41,7 @@ trigger-builder-herokuish-builder-build() { fi "$DOCKER_BIN" container commit "${DOCKER_COMMIT_LABEL_ARGS[@]}" "$CID" "$IMAGE" >/dev/null - plugn trigger scheduler-register-retired "$APP" "$CID" + DOKKU_SKIP_IMAGE_CLEANUP_REGISTRATION=1 plugn trigger scheduler-register-retired "$APP" "$CID" [[ -d $DOKKU_APP_CACHE_DIR ]] || mkdir -p "$DOKKU_APP_CACHE_DIR" plugn trigger pre-build-buildpack "$APP" "$SOURCECODE_WORK_DIR" diff --git a/plugins/scheduler-docker-local/scheduler-register-retired b/plugins/scheduler-docker-local/scheduler-register-retired index eb26b2951..dd813729e 100755 --- a/plugins/scheduler-docker-local/scheduler-register-retired +++ b/plugins/scheduler-docker-local/scheduler-register-retired @@ -18,7 +18,7 @@ trigger-scheduler-docker-local-scheduler-register-retired() { fi fn-scheduler-docker-local-register-retired "container" "$APP" "$CONTAINER_ID" "$WAIT" - if [[ -n "$IMAGE_ID" ]]; then + if [[ -n "$IMAGE_ID" ]] && [[ -z "$DOKKU_SKIP_IMAGE_CLEANUP_REGISTRATION" ]]; then fn-scheduler-docker-local-register-retired "image" "$APP" "$IMAGE_ID" "$WAIT" fi }