Fix build against the swarm cluster by joining buffered output before parsing json.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
parent
fe65c0258d
commit
3661e8bc74
7 changed files with 49 additions and 37 deletions
|
|
@ -33,6 +33,8 @@ from .progress_stream import stream_output
|
|||
from .progress_stream import StreamOutputError
|
||||
from .utils import json_hash
|
||||
from .utils import parallel_execute
|
||||
from .utils import split_buffer
|
||||
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -722,7 +724,7 @@ class Service(object):
|
|||
)
|
||||
|
||||
try:
|
||||
all_events = stream_output(build_output, sys.stdout)
|
||||
all_events = stream_output(split_buffer(build_output), sys.stdout)
|
||||
except StreamOutputError as e:
|
||||
raise BuildError(self, six.text_type(e))
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue