Merge pull request saltstack#9119 from ticosax/add-timout-for-docker-…

…build Some images might take longer to build
alekibango · Dec 9, 2013 · 85ae120 · 85ae120
2 parents cf73e91 + 028d25a
commit 85ae120
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/salt/modules/dockerio.py b/salt/modules/dockerio.py
@@ -233,7 +233,7 @@ def valid(m, id=NOTSET, comment=VALID_RESPONSE, out=None):
     return _set_status(m, status=True, id=id, comment=comment, out=out)
 
 
-def _get_client(version=None):
+def _get_client(version=None, timeout=None):
     '''
     Get a connection to a docker API (socket or URL)
     based on config.get mechanism (pillar -> grains)
@@ -250,13 +250,15 @@ def _get_client(version=None):
     '''
     kwargs = {}
     get = __salt__['config.get']
-    for k, p in {
-        'base_url': 'docker.url',
-        'version': 'docker.version',
-    }.items():
+    for k, p in (('base_url', 'docker.url'),
+                 ('version', 'docker.version')):
         param = get(p, NOTSET)
         if param is not NOTSET:
             kwargs[k] = param
+    if timeout is not None:
+        # make sure we override default timeout of docker-py
+        # only if defined by user.
+        kwargs['timeout'] = timeout
     client = docker.Client(**kwargs)
     # force 1..5 API for registry login
     if not version:
@@ -1362,6 +1364,7 @@ def build(path=None,
           fileobj=None,
           nocache=False,
           rm=True,
+          timeout=None,
           *args, **kwargs):
     '''
     Build a docker image from a dockerfile or an URL
@@ -1381,14 +1384,16 @@ def build(path=None,
         do not use docker image cache
     rm
         remove intermediate commits
+    timeout
+        timeout is seconds before aborting
 
     CLI Example:
 
     .. code-block:: bash
 
         salt '*' docker.build
     '''
-    client = _get_client()
+    client = _get_client(timeout=timeout)
     status = base_status.copy()
     if path or fileobj:
         try:

diff --git a/salt/states/dockerio.py b/salt/states/dockerio.py
@@ -232,6 +232,7 @@ def built(name,
           nocache=False,
           rm=True,
           force=False,
+          timeout=None,
           *args, **kwargs):
     '''
     Build a docker image from a dockerfile or an URL
@@ -258,7 +259,8 @@ def built(name,
         path=path,
         quiet=quiet,
         nocache=nocache,
-        rm=rm
+        rm=rm,
+        timeout=timeout,
     )
     status = _ret_status(func(*a, **kw), name)
     return status