Merge pull request #4 from chassing/master

fix NoneType is not interable in case of no port mapping
ShaneDrury · Aug 12, 2016 · fbefe33 · fbefe33
2 parents 64653ac + e187f86
commit fbefe33
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/dockerintegration/docker.py b/dockerintegration/docker.py
@@ -82,13 +82,16 @@ def internal_port_from_docker(docker_port):
 
 
 def port_mappings_from_container(docker_container):
-    return {
-        internal_port_from_docker(internal): [
-            HostAddress(
-                ip=address['HostIp'],
-                port=int(address['HostPort'])
-            )
-            for address in addresses
+    mappings = {}
+    for internal, addresses in six.iteritems(docker_container.ports):
+        if not addresses:
+            mappings[internal_port_from_docker(internal)] = []
+        else:
+            mappings[internal_port_from_docker(internal)] = [
+                HostAddress(
+                    ip=address['HostIp'],
+                    port=int(address['HostPort'])
+                )
+                for address in addresses
         ]
-        for internal, addresses in six.iteritems(docker_container.ports)
-    }
+    return mappings