diff options
| author | Matt Woodson <mwoodson@gmail.com> | 2015-09-21 12:54:18 -0400 |
|---|---|---|
| committer | Matt Woodson <mwoodson@gmail.com> | 2015-09-21 12:54:18 -0400 |
| commit | ce79b88ba3d5e1adf71e073eafa4fb4a9c77918b (patch) | |
| tree | 6cb650b20dadb43d1461bdb5b8dcba38ae31e3eb | |
| parent | 514dc4baac5e9bd8d943100a7aef0fc13c82c984 (diff) | |
| parent | 15fef0ed1619709446d7dd0b61d198cc650f53cc (diff) | |
| download | openshift-ce79b88ba3d5e1adf71e073eafa4fb4a9c77918b.tar.gz openshift-ce79b88ba3d5e1adf71e073eafa4fb4a9c77918b.tar.bz2 openshift-ce79b88ba3d5e1adf71e073eafa4fb4a9c77918b.tar.xz openshift-ce79b88ba3d5e1adf71e073eafa4fb4a9c77918b.zip | |
Merge pull request #598 from mwoodson/cleanup
made docker cleanup exclude certain regitries
| -rw-r--r-- | playbooks/adhoc/docker_storage_cleanup/docker_storage_cleanup.yml | 7 |
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 |