summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Woodson <mwoodson@redhat.com>2015-09-21 12:51:56 -0400
committerMatt Woodson <mwoodson@redhat.com>2015-09-21 12:51:56 -0400
commit15fef0ed1619709446d7dd0b61d198cc650f53cc (patch)
tree6cb650b20dadb43d1461bdb5b8dcba38ae31e3eb
parent514dc4baac5e9bd8d943100a7aef0fc13c82c984 (diff)
downloadopenshift-15fef0ed1619709446d7dd0b61d198cc650f53cc.tar.gz
openshift-15fef0ed1619709446d7dd0b61d198cc650f53cc.tar.bz2
openshift-15fef0ed1619709446d7dd0b61d198cc650f53cc.tar.xz
openshift-15fef0ed1619709446d7dd0b61d198cc650f53cc.zip
changed the docker cleanup to exclude certain registries
-rw-r--r--playbooks/adhoc/docker_storage_cleanup/docker_storage_cleanup.yml7
1 files changed, 3 insertions, 4 deletions
diff --git a/playbooks/adhoc/docker_storage_cleanup/docker_storage_cleanup.yml b/playbooks/adhoc/docker_storage_cleanup/docker_storage_cleanup.yml
index 53a5c15ef..a19291a9f 100644
--- a/playbooks/adhoc/docker_storage_cleanup/docker_storage_cleanup.yml
+++ b/playbooks/adhoc/docker_storage_cleanup/docker_storage_cleanup.yml
@@ -51,10 +51,9 @@
shell: "docker images -q -f dangling=true | xargs --no-run-if-empty docker rmi"
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
+ - name: Remove non-running docker images
+ shell: "docker images | grep -v -e registry.access.redhat.com -e docker-registry.usersys.redhat.com -e docker-registry.ops.rhcloud.com | awk '{print $3}' | 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