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

Merge pull request #3627 from dokku/3474-synchronous-image-removal

Browse Source 
Make image removal synchronous
This commit is contained in:
Jose Diaz-Gonzalez
2019-08-05 11:38:49 -04:00
committed by GitHub
parent 7de242b4ee 008fafbed8
commit 0567bfd65d
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/common/functions
View File

@@ -633,10 +633,10 @@ docker_cleanup() {
# delete danging images
# shellcheck disable=SC2046
"$DOCKER_BIN" rmi $("$DOCKER_BIN" images -f 'dangling=true' -f "label=com.dokku.app-name=$APP" -q) &>/dev/null &
"$DOCKER_BIN" rmi $("$DOCKER_BIN" images -f 'dangling=true' -f "label=com.dokku.app-name=$APP" -q) &>/dev/null || true
# delete unused images
docker image prune --all --filter "label=com.dokku.app-name=$APP" &>/dev/null &
"$DOCKER_BIN" image prune --all --filter "label=com.dokku.app-name=$APP" --force &>/dev/null || true
else
# delete all non-running containers
# shellcheck disable=SC2046
@@ -648,10 +648,7 @@ docker_cleanup() {
# delete danging images
# shellcheck disable=SC2046
"$DOCKER_BIN" rmi $("$DOCKER_BIN" images -f 'dangling=true' -q) &>/dev/null &
# delete unused images
docker image prune --all &>/dev/null &
"$DOCKER_BIN" rmi $("$DOCKER_BIN" images -f 'dangling=true' -q) &>/dev/null || true
fi
}

9
plugins/scheduler-docker-local/scheduler-docker-cleanup
View File

@@ -23,10 +23,10 @@ scheduler-docker-local-scheduler-docker-cleanup() {
# delete danging images
# shellcheck disable=SC2046
"$DOCKER_BIN" rmi $("$DOCKER_BIN" images -f 'dangling=true' -f "label=com.dokku.app-name=$APP" -q) &>/dev/null &
"$DOCKER_BIN" rmi $("$DOCKER_BIN" images -f 'dangling=true' -f "label=com.dokku.app-name=$APP" -q) &>/dev/null || true
# delete unused images
docker image prune --all --filter "label=com.dokku.app-name=$APP" &>/dev/null &
"$DOCKER_BIN" image prune --all --filter "label=com.dokku.app-name=$APP" --force &>/dev/null || true
else
# delete all non-running containers
# shellcheck disable=SC2046
@@ -38,10 +38,7 @@ scheduler-docker-local-scheduler-docker-cleanup() {
# delete danging images
# shellcheck disable=SC2046
"$DOCKER_BIN" rmi $("$DOCKER_BIN" images -f 'dangling=true' -q) &>/dev/null &
# delete unused images
docker image prune --all &>/dev/null &
"$DOCKER_BIN" rmi $("$DOCKER_BIN" images -f 'dangling=true' -q) &>/dev/null || true
fi
}