Parcourir la source

Update docker.Client to default to DOCKER_HOST so that it "just works" more often

Also, update docker-py requirement to 0.4.0.

See also https://github.com/dotcloud/docker-py/pull/204 (especially the discussion there).
Tianon Gravi il y a 11 ans
Parent
commit
d7df641f53
2 fichiers modifiés avec 3 ajouts et 2 suppressions
  1. 2 1
      stackbrew/brew/brew.py
  2. 1 1
      stackbrew/requirements.txt

+ 2 - 1
stackbrew/brew/brew.py

@@ -264,7 +264,8 @@ class LocalBuilder(StackbrewBuilder):
         super(LocalBuilder, self).__init__(
             library, namespaces, targetlist, repo_cache
         )
-        self.client = docker.Client(version='1.9', timeout=10000)
+        self.client = docker.Client(version='1.9', timeout=10000,
+                                    base_url=os.getenv('DOCKER_HOST'))
         self.build_success_re = r'^Successfully built ([a-f0-9]+)\n$'
 
     def do_build(self, repo, version, dockerfile_location, callback=None):

+ 1 - 1
stackbrew/requirements.txt

@@ -1,3 +1,3 @@
 Flask==0.9
 SQLAlchemy==0.8.2
-docker-py==0.3.1
+docker-py==0.4.0