From 91414bb8ffd988321cfa7120167636757e265a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
Date: Wed, 20 Jun 2018 10:17:32 +0200
Subject: [PATCH] Remove stream from build_image_from_path as it has been
 removed from the docker-py, simplifie the build invocation.

Fixes: #1005
---
 atomic_reactor/buildimage.py |  2 +-
 atomic_reactor/core.py       | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/atomic_reactor/buildimage.py b/atomic_reactor/buildimage.py
index 64e2f95..07b08f3 100644
--- a/atomic_reactor/buildimage.py
+++ b/atomic_reactor/buildimage.py
@@ -77,7 +77,7 @@ class BuildImageBuilder(object):
             shutil.copy(reactor_tarball, reactor_tb_path)
 
             image_name = ImageName.parse(image)
-            logs_gen = self.tasker.build_image_from_path(df_tmpdir, image_name, stream=True,
+            logs_gen = self.tasker.build_image_from_path(df_tmpdir, image_name,
                                                          use_cache=use_cache)
             wait_for_command(logs_gen)
         finally:
diff --git a/atomic_reactor/core.py b/atomic_reactor/core.py
index 2e7fc78..f75de6c 100644
--- a/atomic_reactor/core.py
+++ b/atomic_reactor/core.py
@@ -323,7 +323,7 @@ class DockerTasker(LastLogger):
 
             return cmd_result
 
-    def build_image_from_path(self, path, image, stream=False, use_cache=False, remove_im=True):
+    def build_image_from_path(self, path, image, use_cache=False, remove_im=True):
         """
         build image from provided path and tag it
 
@@ -338,15 +338,9 @@ class DockerTasker(LastLogger):
         :return: generator
         """
         logger.info("building image '%s' from path '%s'", image, path)
-        try:
-            response = self.d.build(path=path, tag=image.to_str(), stream=stream,
-                                    nocache=not use_cache, decode=True,
-                                    rm=remove_im, forcerm=True, pull=False)  # returns generator
-        except TypeError:
-            # because changing api is fun
-            response = self.d.build(path=path, tag=image.to_str(), stream=stream,
-                                    nocache=not use_cache, decode=True,
-                                    rm=remove_im, forcerm=True,)  # returns generator
+        response = self.d.build(path=path, tag=image.to_str(),
+                                nocache=not use_cache, decode=True,
+                                rm=remove_im, forcerm=True, pull=False)  # returns generator
         return response
 
     def build_image_from_git(self, url, image, git_path=None, git_commit=None,
@@ -376,8 +370,7 @@ class DockerTasker(LastLogger):
             build_file_path, build_file_dir = figure_out_build_file(temp_dir, git_path)
             if copy_dockerfile_to:  # TODO: pre build plugin
                 shutil.copyfile(build_file_path, copy_dockerfile_to)
-            response = self.build_image_from_path(build_file_dir, image, stream=stream,
-                                                  use_cache=use_cache)
+            response = self.build_image_from_path(build_file_dir, image, use_cache=use_cache)
         finally:
             try:
                 shutil.rmtree(temp_dir)
-- 
2.17.1