From e7acff0bcfa442b42b44e4c8b7a080474251f476 Mon Sep 17 00:00:00 2001 From: Pablo Carranza Velez Date: Thu, 29 Sep 2016 19:34:19 -0300 Subject: [PATCH] On cleanup, force removal for images and containers, and remove container volumes --- CHANGELOG.md | 1 + src/docker-utils.coffee | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b012b4a..c1e69dd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +* On cleanup, force removal for images and containers, and remove container volumes [Pablo] * Add system logs for Shutdown, Reboot and Purge [Pablo] # v2.3.0 diff --git a/src/docker-utils.coffee b/src/docker-utils.coffee index 4ab7d914..80e430d1 100644 --- a/src/docker-utils.coffee +++ b/src/docker-utils.coffee @@ -145,7 +145,7 @@ do -> return true return containerHasExited(containerInfo.Id) .map (containerInfo) -> - docker.getContainer(containerInfo.Id).removeAsync() + docker.getContainer(containerInfo.Id).removeAsync(v: true, force: true) .then -> console.log('Deleted container:', containerInfo.Id, containerInfo.Image) .catch(_.noop) @@ -155,7 +155,7 @@ do -> return _.contains(appTags, tag) or _.contains(supervisorTags, tag) or _.contains(locallyCreatedTags, tag) Promise.map imagesToClean, (image) -> Promise.map image.RepoTags.concat(image.Id), (tag) -> - docker.getImage(tag).removeAsync() + docker.getImage(tag).removeAsync(force: true) .then -> console.log('Deleted image:', tag, image.Id, image.RepoTags) .catch(_.noop)