summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Woodson <mwoodson@gmail.com>2015-09-21 10:52:32 -0400
committerMatt Woodson <mwoodson@gmail.com>2015-09-21 10:52:32 -0400
commit514dc4baac5e9bd8d943100a7aef0fc13c82c984 (patch)
tree430cf8bc7d20e4e17187da98c9478d1eeede4c79
parent8f6c6824073dff0cea3cd793db2745fb6cf52931 (diff)
parentd02e346a12c356bd87c0e233d22db03791732841 (diff)
downloadopenshift-514dc4baac5e9bd8d943100a7aef0fc13c82c984.tar.gz
openshift-514dc4baac5e9bd8d943100a7aef0fc13c82c984.tar.bz2
openshift-514dc4baac5e9bd8d943100a7aef0fc13c82c984.tar.xz
openshift-514dc4baac5e9bd8d943100a7aef0fc13c82c984.zip
Merge pull request #597 from mwoodson/cleanup
removed dangerous docker cleanup option
-rw-r--r--playbooks/adhoc/docker_storage_cleanup/docker_storage_cleanup.yml7
1 files changed, 4 insertions, 3 deletions
diff --git a/playbooks/adhoc/docker_storage_cleanup/docker_storage_cleanup.yml b/playbooks/adhoc/docker_storage_cleanup/docker_storage_cleanup.yml
index 1946a5f4f..53a5c15ef 100644
--- a/playbooks/adhoc/docker_storage_cleanup/docker_storage_cleanup.yml
+++ b/playbooks/adhoc/docker_storage_cleanup/docker_storage_cleanup.yml
@@ -51,9 +51,10 @@
shell: "docker images -q -f dangling=true | xargs --no-run-if-empty docker rmi"
ignore_errors: yes
- - name: Remove non-running docker images
- shell: "docker images -aq | xargs --no-run-if-empty docker rmi 2>/dev/null"
- ignore_errors: yes
+# mwoodson & twiest: this is dangerous, commenting out for now.
+# - name: Remove non-running docker images
+# shell: "docker images -aq | xargs --no-run-if-empty docker rmi 2>/dev/null"
+# ignore_errors: yes
# leaving off the '-t' for docker exec. With it, it doesn't work with ansible and tty support
- name: update zabbix docker items