updates for docker sdk >= 3.0

avirshup · Apr 3, 2018 · 19b89c9 · 19b89c9
1 parent a391c1c
commit 19b89c9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/dockermake/staging.py b/dockermake/staging.py
@@ -90,7 +90,7 @@ def stage(self, startimage, newimage):
             # write files to disk (would be nice to stream them, haven't gotten it to work)
             tempdir = tempfile.mkdtemp(dir=BUILD_TEMPDIR)
             with open(os.path.join(tempdir, 'content.tar'), 'wb') as localfile:
-                for chunk in tarfile_stream.stream():
+                for chunk in tarfile_stream:
                     localfile.write(chunk)
             os.mkdir(cachedir)
             os.rename(tempdir, cachedir)

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
 termcolor
-docker >=2.0, <3.0
+docker >=3.0
 future
 pyyaml
diff --git a/setup.py b/setup.py
@@ -19,5 +19,8 @@
                       'docker-make = dockermake.__main__:main'
                   ]
         },
-        install_requires=requirements,
+        install_requires=['termcolor',
+                          'docker',
+                          'future',
+                          'pyyaml'],
 )