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

Revert change that whitelisted dokku-labeled containers

Browse Source 
Rather than having a one-off hack for "blessed" containers, we should solve the issue properly. As that would take a bit more work, reverting to the previous state is preferred.

Better that we solve a problem problem than with a hack that we'll need to roll back in the future.

Refs #1220

[ci skip]
This commit is contained in:
Jose Diaz-Gonzalez
2015-09-08 14:35:00 -04:00
parent 39f09740b7
commit 88bd50abaf
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/common/functions
View File

@@ -323,12 +323,8 @@ release_and_deploy() {
docker_cleanup() { docker_cleanup() {
# delete all non-running containers # delete all non-running containers
# if a container has the label `dokku.service`,
# then that container is not deleted.
# This can be used to mark data containers
# as non-removable by the cleanup function
# shellcheck disable=SC2046 # shellcheck disable=SC2046
docker rm $(comm <(docker ps -aq -f 'status=exited' | sort) <(docker ps -aq -f 'status=exited' -f 'label=dokku.service' | sort) -3) &> /dev/null || true docker rm $(docker ps -a -f 'status=exited' -q) &> /dev/null || true
# delete unused images # delete unused images
# shellcheck disable=SC2046 # shellcheck disable=SC2046
docker rmi $(docker images -f 'dangling=true' -q) &> /dev/null & docker rmi $(docker images -f 'dangling=true' -q) &> /dev/null &