0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #35404 from tonistiigi/stream-ctx-fix

Browse source 
builder: fix long stream sync
This commit is contained in:
Sebastiaan van Stijn 2017-11-04 01:07:06 +01:00 • committed by GitHub
commit 2c1043c913
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
builder/dockerfile/builder.go
View file

@ -131,10 +131,10 @@ func (bm *BuildManager) initializeClientSession(ctx context.Context, cancel func
}
logrus.Debug("client is session enabled")
ctx, cancelCtx := context.WithTimeout(ctx, sessionConnectTimeout)
connectCtx, cancelCtx := context.WithTimeout(ctx, sessionConnectTimeout)
defer cancelCtx()
c, err := bm.sg.Get(ctx, options.SessionID)
c, err := bm.sg.Get(connectCtx, options.SessionID)
if err != nil {
return nil, err
}