Merge pull request #1444 from progrium/docker-cleanup

Docker cleanup
This commit is contained in:
Jose Diaz-Gonzalez committed 2015-09-06 20:13:32 -04:00
commit 1de092d84e
2 files changed
+16 -8

No files matched your search

+2 -7
View File
@@ -53,7 +53,7 @@ case "$1" in
receive) receive)
APP="$2"; IMAGE=$(get_app_image_name $APP); IMAGE_SOURCE_TYPE="$3"; TMP_WORK_DIR="$4" APP="$2"; IMAGE=$(get_app_image_name $APP); IMAGE_SOURCE_TYPE="$3"; TMP_WORK_DIR="$4"
dokku_log_info1 "Cleaning up..." dokku_log_info1 "Cleaning up..."
dokku cleanup docker_cleanup
dokku_log_info1 "Building $APP from $IMAGE_SOURCE_TYPE..." dokku_log_info1 "Building $APP from $IMAGE_SOURCE_TYPE..."
dokku build "$APP" "$IMAGE_SOURCE_TYPE" "$TMP_WORK_DIR" dokku build "$APP" "$IMAGE_SOURCE_TYPE" "$TMP_WORK_DIR"
release_and_deploy "$APP" release_and_deploy "$APP"
@@ -192,12 +192,7 @@ case "$1" in
;; ;;
cleanup) cleanup)
# delete all non-running container docker_cleanup
# shellcheck disable=SC2046
docker rm $(docker ps -a -f 'status=exited' -q) &> /dev/null || true
# delete unused images
# shellcheck disable=SC2046
docker rmi $(docker images -f 'dangling=true' -q) &> /dev/null &
;; ;;
plugins) plugins)
+14 -1
View File
@@ -82,7 +82,7 @@ dokku_log_verbose() {
} }
dokku_log_warn() { dokku_log_warn() {
echo " ! $@" echo " ! $@"
} }
dokku_log_fail() { dokku_log_fail() {
@@ -320,3 +320,16 @@ release_and_deploy() {
echo echo
fi fi
} }
docker_cleanup() {
# delete all non-running containers
# if a container has the label `dokku`,
# then that container is not deleted.
# This can be used to mark data containers
# as non-removable by the cleanup function
# shellcheck disable=SC2046
docker rm $(comm <(docker ps -aq -f 'status=exited' | sort) <(docker ps -aq -f 'status=exited' -f 'label=dokku' | sort) -3) &> /dev/null || true
# delete unused images
# shellcheck disable=SC2046
docker rmi $(docker images -f 'dangling=true' -q) &> /dev/null &
}