Skip to content

builder: fix long stream sync#35404

Merged
thaJeztah merged 1 commit into
moby:masterfrom
tonistiigi:stream-ctx-fix
Nov 4, 2017
Merged

builder: fix long stream sync#35404
thaJeztah merged 1 commit into
moby:masterfrom
tonistiigi:stream-ctx-fix

Conversation

@tonistiigi
Copy link
Copy Markdown
Member

fixes #35391

The 5 second timeout should only count for the time it takes to connect to the session, not for the actual transfer.

Signed-off-by: Tonis Tiigi [email protected]

Copy link
Copy Markdown
Member

@dnephin dnephin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM,

just a naming nit

Comment thread builder/dockerfile/builder.go Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe connectCtx since the context is for connect, but other session calls below use the original ctx. sessionCtx seems misleading

@delissonjunio
Copy link
Copy Markdown

Sorry, I'm not really familiar with Docker's development timeline yet - when exactly can I get to try the fix out? I would really like to be working with this as soon as possible

@tonistiigi
Copy link
Copy Markdown
Member Author

@delissonjunio After it gets merged, depending on what priority is assigned to the issue it may get backported to affected releases. If not, it will end up either in 17.11 or 17.12 /cc @thaJeztah

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah thaJeztah added the area/builder Build label Nov 4, 2017
@thaJeztah thaJeztah merged commit 2c1043c into moby:master Nov 4, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Docker fails to build with --stream with a large context

5 participants