Merge pull request #729 from tonistiigi/session-context

llbsolver: keep session for context calls
moby · Nov 20, 2018 · f2f4b53 · f2f4b53
2 parents ef00d30 + f6a8961
commit f2f4b53
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/solver/jobs.go b/solver/jobs.go
@@ -171,6 +171,7 @@ func (sb *subBuilder) Build(ctx context.Context, e Edge) (CachedResult, error) {
 }
 
 func (sb *subBuilder) Context(ctx context.Context) context.Context {
+	ctx = session.NewContext(ctx, sb.state.getSessionID())
 	return opentracing.ContextWithSpan(progress.WithProgress(ctx, sb.mpw), sb.mspan)
 }
 
@@ -475,6 +476,7 @@ func (j *Job) Discard() error {
 }
 
 func (j *Job) Context(ctx context.Context) context.Context {
+	ctx = session.NewContext(ctx, j.SessionID)
 	return progress.WithProgress(ctx, j.pw)
 }