github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #4853 from dokku/4825-dangling-images

Browse Source 
Remove dangling images
This commit is contained in:
Jose Diaz-Gonzalez
2021-10-09 21:12:53 -04:00
committed by GitHub
parent 6c6e72ca04 9616473c3a
commit cd7b8afccb
6 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/scheduler-docker-local/scheduler-register-retired
View File

@@ -19,7 +19,13 @@ trigger-scheduler-docker-local-scheduler-register-retired() {
fn-scheduler-docker-local-register-retired "container" "$APP" "$CONTAINER_ID" "$WAIT"
if [[ -n "$IMAGE_ID" ]] && [[ -z "$DOKKU_SKIP_IMAGE_CLEANUP_REGISTRATION" ]]; then
ALT_IMAGE_TAG="$("$DOCKER_BIN" image inspect --format '{{ index .Config.Labels "com.dokku.docker-image-labeler/alternate-tags" }}' "$IMAGE_ID" 2>/dev/null || true)"
fn-scheduler-docker-local-register-retired "image" "$APP" "$IMAGE_ID" "$WAIT"
if [[ -n "$ALT_IMAGE_TAG" ]]; then
ALT_IMAGE_ID="$("$DOCKER_BIN" image inspect --format '{{ .Id }}' "$(echo "$ALT_IMAGE_TAG" | jq -r ".[]")" 2>/dev/null || true)"
fn-scheduler-docker-local-register-retired "image" "$APP" "$(echo "$ALT_IMAGE_ID" | cut -d ':' -f2)" "$WAIT"
fi
fi
}

4
plugins/scheduler-docker-local/scheduler-stop
View File

@@ -31,6 +31,10 @@ trigger-scheduler-docker-local-scheduler-stop() {
local DOKKU_APP_CIDS=$(get_app_container_ids "$APP")
if [[ -n "$DOKKU_APP_CIDS" ]]; then
for CID in $DOKKU_APP_CIDS; do
plugn trigger scheduler-register-retired "$APP" "$CID"
done
# shellcheck disable=SC2086
"$DOCKER_BIN" container rm --force $DOKKU_APP_CIDS >/dev/null 2>&1 || true
fi