From 92ecc76000ed550e186e91cb8fc27a70e48d609e Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 12 Mar 2022 06:24:42 -0500 Subject: [PATCH] chore: always use long-form for image removal --- plugins/scheduler-docker-local/internal-functions | 2 +- plugins/scheduler-docker-local/post-delete | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/scheduler-docker-local/internal-functions b/plugins/scheduler-docker-local/internal-functions index 8568bd764..39c4d0a01 100755 --- a/plugins/scheduler-docker-local/internal-functions +++ b/plugins/scheduler-docker-local/internal-functions @@ -188,7 +188,7 @@ fn-scheduler-docker-local-retire-images() { fi dokku_log_verbose_quiet "Attempting to retire $RETIRE_APP image $IMAGE_ID" - if RM_OUTPUT="$("$DOCKER_BIN" image rm "$IMAGE_ID" 2>&1)"; then + if RM_OUTPUT="$("$DOCKER_BIN" image remove "$IMAGE_ID" 2>&1)"; then DEAD_IMAGES+=("$IMAGE_ID") continue fi diff --git a/plugins/scheduler-docker-local/post-delete b/plugins/scheduler-docker-local/post-delete index da66df2bb..dd1bce3c9 100755 --- a/plugins/scheduler-docker-local/post-delete +++ b/plugins/scheduler-docker-local/post-delete @@ -28,7 +28,7 @@ trigger-scheduler-docker-local-post-delete() { fi # shellcheck disable=SC2046 - "$DOCKER_BIN" image rm $("$DOCKER_BIN" image list --quiet "$IMAGE_REPO" | xargs) &>/dev/null || true + "$DOCKER_BIN" image remove $("$DOCKER_BIN" image list --quiet "$IMAGE_REPO" | xargs) &>/dev/null || true } trigger-scheduler-docker-local-post-delete "$@"