dockerui: use CachedGroup in dockerui context resolve

Signed-off-by: Tonis Tiigi <[email protected]>
moby · Jun 12, 2024 · f15779d · f15779d
1 parent 53fc6e6
commit f15779d
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/frontend/dockerui/config.go b/frontend/dockerui/config.go
@@ -78,8 +78,7 @@ type Client struct {
  Config
  client client.Client
  ignoreCache []string
- bctx *buildContext
- g flightcontrol.Group[*buildContext]
+ g flightcontrol.CachedGroup[*buildContext]
  bopts client.BuildOpts
 
  dockerignore []byte
@@ -288,14 +287,7 @@ func (bc *Client) init() error {
 
 func (bc *Client) buildContext(ctx context.Context) (*buildContext, error) {
  return bc.g.Do(ctx, "initcontext", func(ctx context.Context) (*buildContext, error) {
- if bc.bctx != nil {
- return bc.bctx, nil
- }
- bctx, err := bc.initContext(ctx)
- if err == nil {
- bc.bctx = bctx
- }
- return bctx, err
+ return bc.initContext(ctx)
  })
 }