@@ -95,8 +95,7 @@ func newBuildCmd() *cobra.Command {
9595// buildRunner carries the dependencies shared across the `build` flow so they
9696// don't have to be threaded through every helper by hand.
9797type buildRunner struct {
98- ctx context.Context
99- log log.Log
98+ log log.Logger
10099 docker * docker.Client
101100 engine * docker.EngineClient
102101 opts * buildOpts
@@ -151,7 +150,7 @@ func runBuild(ctx context.Context, out Output, opts *buildOpts) error {
151150 // Setup logger
152151 logger := log .New (log.Options {
153152 Version : cliVersion (),
154- Level : log .MapLogLevel (opts .logLevel ),
153+ Level : log .ParseLevel (opts .logLevel ),
155154 Format : opts .logFormat ,
156155 Writer : os .Stderr ,
157156 })
@@ -181,12 +180,12 @@ func runBuild(ctx context.Context, out Output, opts *buildOpts) error {
181180 }
182181 defer engine .Close ()
183182
184- run := & buildRunner {ctx : ctx , log : logger , docker : dockerClient , engine : engine , opts : opts }
183+ run := & buildRunner {log : logger , docker : dockerClient , engine : engine , opts : opts }
185184
186185 // Detect BuildKit
187186 var useBuildx bool
188187 if opts .buildkit != "never" {
189- bk := dockerClient .DetectBuildKit ()
188+ bk := dockerClient .DetectBuildKit (ctx )
190189 useBuildx = bk .Available
191190 }
192191
@@ -214,12 +213,12 @@ func runBuild(ctx context.Context, out Output, opts *buildOpts) error {
214213 var imageNameResult []string
215214
216215 if cfg .IsDockerfileConfig () {
217- imageNameResult , err = run .buildDockerfile (cfg , loadResult , useBuildx )
216+ imageNameResult , err = run .buildDockerfile (ctx , cfg , loadResult , useBuildx )
218217 } else if cfg .IsComposeConfig () {
219- imageNameResult , err = run .buildCompose (cfg , useBuildx )
218+ imageNameResult , err = run .buildCompose (ctx , cfg , useBuildx )
220219 } else {
221220 // Image-based config
222- imageNameResult , err = run .buildImage (cfg , loadResult , useBuildx )
221+ imageNameResult , err = run .buildImage (ctx , cfg , loadResult , useBuildx )
223222 }
224223
225224 if err != nil {
@@ -237,10 +236,10 @@ func runBuild(ctx context.Context, out Output, opts *buildOpts) error {
237236 })
238237}
239238
240- func (r * buildRunner ) buildDockerfile (cfg * config.DevContainerConfig , loadResult * config.LoadResult , useBuildx bool ) ([]string , error ) {
241- ctx , logger , dockerClient , engine , opts := r . ctx , r .log , r .docker , r .engine , r .opts
239+ func (r * buildRunner ) buildDockerfile (ctx context. Context , cfg * config.DevContainer , loadResult * config.LoadResult , useBuildx bool ) ([]string , error ) {
240+ logger , dockerClient , engine , opts := r .log , r .docker , r .engine , r .opts
242241 // Read Dockerfile
243- dockerfilePath := cfg .GetDockerfile ()
242+ dockerfilePath := cfg .Dockerfile ()
244243 if dockerfilePath == "" {
245244 return nil , fmt .Errorf ("no Dockerfile specified" )
246245 }
@@ -263,7 +262,7 @@ func (r *buildRunner) buildDockerfile(cfg *config.DevContainerConfig, loadResult
263262 stageName = cfg .Build .Target
264263 } else {
265264 var modifiedContent string
266- stageName , modifiedContent = docker .EnsureDockerfileHasFinalStageName (string (content ), "dev_container_auto_added_stage_label" )
265+ stageName , modifiedContent = docker .EnsureFinalStageName (string (content ), "dev_container_auto_added_stage_label" )
267266 if modifiedContent != "" {
268267 // Write modified Dockerfile to temp location
269268 tmpDockerfile := dockerfilePath + ".devcontainer.build"
@@ -303,8 +302,8 @@ func (r *buildRunner) buildDockerfile(cfg *config.DevContainerConfig, loadResult
303302
304303 // Build context
305304 contextPath := configDir
306- if cfg .GetBuildContext () != "" {
307- contextPath = filepath .Join (configDir , cfg .GetBuildContext ())
305+ if cfg .BuildContext () != "" {
306+ contextPath = filepath .Join (configDir , cfg .BuildContext ())
308307 }
309308
310309 // Build args from config
@@ -366,7 +365,7 @@ func (r *buildRunner) buildDockerfile(cfg *config.DevContainerConfig, loadResult
366365 Secrets : buildSecrets ,
367366 }
368367
369- result , err := dockerClient .Build (buildOpts )
368+ result , err := dockerClient .Build (ctx , buildOpts )
370369 if err != nil {
371370 return nil , err
372371 }
@@ -404,8 +403,8 @@ func (r *buildRunner) buildDockerfile(cfg *config.DevContainerConfig, loadResult
404403 return imageNames , nil
405404}
406405
407- func (r * buildRunner ) buildImage (cfg * config.DevContainerConfig , loadResult * config.LoadResult , useBuildx bool ) ([]string , error ) {
408- ctx , logger , dockerClient , engine , opts := r . ctx , r .log , r .docker , r .engine , r .opts
406+ func (r * buildRunner ) buildImage (ctx context. Context , cfg * config.DevContainer , loadResult * config.LoadResult , useBuildx bool ) ([]string , error ) {
407+ logger , dockerClient , engine , opts := r .log , r .docker , r .engine , r .opts
409408 if cfg .Image == "" {
410409 return nil , fmt .Errorf ("no image specified in devcontainer.json" )
411410 }
@@ -414,7 +413,7 @@ func (r *buildRunner) buildImage(cfg *config.DevContainerConfig, loadResult *con
414413 // surface immediately instead of after an expensive pull.
415414 if len (cfg .Features ) > 0 {
416415 for id := range cfg .Features {
417- srcType := features .ClassifyFeatureID (id )
416+ srcType := features .ClassifyID (id )
418417 if srcType == features .SourceLegacyShorthand {
419418 name := id
420419 if idx := strings .LastIndex (id , ":" ); idx > 0 {
@@ -521,7 +520,7 @@ func (r *buildRunner) buildImage(cfg *config.DevContainerConfig, loadResult *con
521520 authEnv , authCleanup := bridgeBuildAuth (logger , "" , featureImageNames , opts .cacheFrom , opts .cacheTo )
522521 defer authCleanup ()
523522
524- result , buildErr := dockerClient .Build (docker.BuildOptions {
523+ result , buildErr := dockerClient .Build (ctx , docker.BuildOptions {
525524 Dockerfile : dfPath ,
526525 ContextPath : tmpDir ,
527526 Tags : featureImageNames ,
@@ -560,7 +559,7 @@ func (r *buildRunner) buildImage(cfg *config.DevContainerConfig, loadResult *con
560559 return nil , fmt .Errorf ("write temp Dockerfile: %w" , err )
561560 }
562561
563- result , buildErr := dockerClient .Build (docker.BuildOptions {
562+ result , buildErr := dockerClient .Build (ctx , docker.BuildOptions {
564563 Dockerfile : dfPath ,
565564 ContextPath : tmpDir ,
566565 Tags : imageNames ,
@@ -572,7 +571,7 @@ func (r *buildRunner) buildImage(cfg *config.DevContainerConfig, loadResult *con
572571 }
573572 if result .ExitCode != 0 {
574573 for _ , name := range opts .imageNames {
575- if tagErr := dockerClient .Tag (cfg .Image , name ); tagErr != nil {
574+ if tagErr := dockerClient .Tag (ctx , cfg .Image , name ); tagErr != nil {
576575 return nil , fmt .Errorf ("failed to build and tag image %q: %w" , name , tagErr )
577576 }
578577 }
@@ -591,7 +590,7 @@ func (r *buildRunner) buildImage(cfg *config.DevContainerConfig, loadResult *con
591590// (string or array). It applies only to the build of the user's Dockerfile; the
592591// feature layers take the flag values alone (matching TS containerFeatures, which
593592// uses additionalCacheFroms only).
594- func cacheFromForDockerfileBuild (flagCacheFrom []string , cfg * config.DevContainerConfig ) []string {
593+ func cacheFromForDockerfileBuild (flagCacheFrom []string , cfg * config.DevContainer ) []string {
595594 if cfg == nil || cfg .Build == nil || len (cfg .Build .CacheFrom ) == 0 {
596595 return flagCacheFrom
597596 }
@@ -601,14 +600,14 @@ func cacheFromForDockerfileBuild(flagCacheFrom []string, cfg *config.DevContaine
601600 return combined
602601}
603602
604- func buildArgsFromConfig (cfg * config.DevContainerConfig ) map [string ]string {
603+ func buildArgsFromConfig (cfg * config.DevContainer ) map [string ]string {
605604 if cfg .Build == nil || cfg .Build .Args == nil {
606605 return map [string ]string {}
607606 }
608607 return cfg .Build .Args
609608}
610609
611- func dockerfileBuildMetadataEntries (cfg * config.DevContainerConfig , baseLabels map [string ]string , logger log.Log ) []imagemeta.Entry {
610+ func dockerfileBuildMetadataEntries (cfg * config.DevContainer , baseLabels map [string ]string , logger log.Logger ) []imagemeta.Entry {
612611 metadata := []imagemeta.Entry {}
613612 if len (baseLabels ) > 0 {
614613 metadata = append (metadata , imagemeta .ReadMetadataFromLabels (baseLabels , logger )... )
@@ -627,7 +626,7 @@ func resolvePath(p string) string {
627626 return filepath .Join (cwd , p )
628627}
629628
630- func buildOptionsFromConfig (cfg * config.DevContainerConfig ) []string {
629+ func buildOptionsFromConfig (cfg * config.DevContainer ) []string {
631630 if cfg .Build == nil || len (cfg .Build .Options ) == 0 {
632631 return nil
633632 }
@@ -669,14 +668,14 @@ func isUserFacingBuildError(err error) bool {
669668 return strings .HasPrefix (msg , legacyFeaturePrefix )
670669}
671670
672- func (r * buildRunner ) buildCompose (cfg * config.DevContainerConfig , useBuildx bool ) ([]string , error ) {
673- ctx , logger , dockerClient , engine , opts := r . ctx , r .log , r .docker , r .engine , r .opts
671+ func (r * buildRunner ) buildCompose (ctx context. Context , cfg * config.DevContainer , useBuildx bool ) ([]string , error ) {
672+ logger , dockerClient , engine , opts := r .log , r .docker , r .engine , r .opts
674673 if cfg .Service == "" {
675674 return nil , fmt .Errorf ("dockerComposeFile config requires 'service' property" )
676675 }
677676
678677 env := osEnvMap ()
679- composeFiles , err := config .GetDockerComposeFilePaths (cfg , env , filepath .Dir (cfg .ConfigFilePath ))
678+ composeFiles , err := config .DockerComposeFilePaths (cfg , env , filepath .Dir (cfg .ConfigFilePath ))
680679 if err != nil {
681680 return nil , fmt .Errorf ("resolve compose files: %w" , err )
682681 }
@@ -686,7 +685,7 @@ func (r *buildRunner) buildCompose(cfg *config.DevContainerConfig, useBuildx boo
686685 return nil , fmt .Errorf ("compose client: %w" , err )
687686 }
688687
689- composeConfig , err := composeClient .Config (composeFiles , "" )
688+ composeConfig , err := composeClient .Config (ctx , composeFiles , "" )
690689 if err != nil {
691690 return nil , fmt .Errorf ("compose config: %w" , err )
692691 }
@@ -706,7 +705,7 @@ func (r *buildRunner) buildCompose(cfg *config.DevContainerConfig, useBuildx boo
706705
707706 if hasBuild {
708707 logger .Write (fmt .Sprintf ("Building compose service %s..." , cfg .Service ), log .LevelInfo )
709- buildErr := composeClient .Build (composeFiles , "" , []string {"--project-name" , projectName }, []string {cfg .Service }, opts .noCache )
708+ buildErr := composeClient .Build (ctx , composeFiles , "" , []string {"--project-name" , projectName }, []string {cfg .Service }, opts .noCache )
710709 if buildErr != nil {
711710 return nil , fmt .Errorf ("compose build: %w" , buildErr )
712711 }
@@ -763,7 +762,7 @@ func (r *buildRunner) buildCompose(cfg *config.DevContainerConfig, useBuildx boo
763762 return nil , fmt .Errorf ("write temp Dockerfile: %w" , err )
764763 }
765764
766- result , buildErr := dockerClient .Build (docker.BuildOptions {
765+ result , buildErr := dockerClient .Build (ctx , docker.BuildOptions {
767766 Dockerfile : dfPath ,
768767 ContextPath : tmpDir ,
769768 Tags : opts .imageNames ,
0 commit comments