From 36134084bc969135332035704fa6719217e1d12b Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Fri, 3 Nov 2017 10:36:12 -0700 Subject: [PATCH] builder: fix long stream sync Signed-off-by: Tonis Tiigi (cherry picked from commit c6703b722e1c0914342d61ca6af77aea93150873) Signed-off-by: Sebastiaan van Stijn --- components/engine/builder/dockerfile/builder.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/builder/dockerfile/builder.go b/components/engine/builder/dockerfile/builder.go index 2b7b43827c..b62d6fc024 100644 --- a/components/engine/builder/dockerfile/builder.go +++ b/components/engine/builder/dockerfile/builder.go @@ -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 }