Merge pull request #45 from samiam/fix_empty_volumes

Correctly handle empty dangling volumes

.pre-commit-config.yaml

@@ -1,5 +1,6 @@
+repos:
 - repo: git://github.com/pre-commit/pre-commit-hooks
-  sha: 'v0.4.2'
+  rev: v1.2.3
   hooks:
     - id: check-added-large-files
     - id: check-docstring-first

.travis.yml

@@ -1,8 +1,12 @@
 language: python
-env:
+matrix:
-- TOXENV=py27
+  include:
-- TOXENV=py33
+    - python: 2.7
-- TOXENV=py34
+      env: TOXENV=py27
+    - python: 3.5
+      env: TOXENV=py35
+    - python: 3.6
+      env: TOXENV=py36
 install:
 - pip install tox
 script:

docker_custodian/docker_gc.py

@@ -76,7 +76,7 @@ def get_all_images(client):
 
 def get_dangling_volumes(client):
     log.info("Getting dangling volumes")
-    volumes = client.volumes({'dangling': True})['Volumes']
+    volumes = client.volumes({'dangling': True})['Volumes'] or []
     log.info("Found %s dangling volumes", len(volumes))
     return volumes
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py33,py34
+envlist = py27,py35,py36
 
 [testenv]
 deps =
@@ -9,5 +9,6 @@ deps =
     pytest
 commands =
     py.test {posargs:tests}
+    pre-commit autoupdate
     pre-commit install -f --install-hooks
     pre-commit run --all-files