Bug 1232982 - don't break the build when docker's initialization fails, r?gps
--- a/testing/vcttesting/docker.py
+++ b/testing/vcttesting/docker.py
@@ -149,18 +149,20 @@ class Docker(object):
'last-treestatus-id',
'vct-cid',
)
for k in keys:
self.state.setdefault(k, None)
try:
self.client = docker.Client(base_url=url, tls=tls, version='auto')
- except DockerException:
+ except DockerException as ex:
+ print "Exception trying to create Docker client:", ex
self.client = None
+ return
# Try to obtain a network hostname for the Docker server. We use this
# for determining where to look for opened ports.
# This is a bit complicated because Docker can be running from a local
# socket or or another host via something like boot2docker.
# TODO look at network info for Docker and extract IP address instead.
docker_url = urlparse.urlparse(self.client.base_url)
self.docker_hostname = docker_url.hostname