naming things...

Co-Authored-By: Yves Brissaud <[email protected]>
Signed-off-by: Nicolas De Loof <[email protected]>

Author: ndeloof

internal/commands/build/build.go

@@ -65,18 +65,16 @@ func Cmd(dockerCli command.Cli) *cobra.Command {
 }
 
 func runBuild(dockerCli command.Cli, application string, opt buildOptions) (reference.Named, error) {
-	ctx := appcontext.Context()
-	info, err := dockerCli.Client().Info(ctx)
+	err := checkMinimalEngineVersion(dockerCli)
 	if err != nil {
 		return nil, err
 	}
-	majorVersion, err := strconv.Atoi(info.ServerVersion[:strings.IndexRune(info.ServerVersion, '.')])
+
+	var ref reference.Named
+	ref, err = packager.GetNamedTagged(opt.tag)
 	if err != nil {
 		return nil, err
 	}
-	if majorVersion < 19 {
-		return nil, errors.New("'build' require docker engine 19.03 or later")
-	}
 
 	app, err := packager.Extract(application)
 	if err != nil {
@@ -101,6 +99,8 @@ func runBuild(dockerCli command.Cli, application string, opt buildOptions) (refe
 
 	debugBuildOpts(buildopts)
 
+	ctx, cancel := context.WithCancel(appcontext.Context())
+	defer cancel()
 	d, err := driver.GetDriver(ctx, "buildx_buildkit_default", nil, dockerCli.Client(), nil, "", nil)
 	if err != nil {
 		return nil, err
@@ -112,25 +112,17 @@ func runBuild(dockerCli command.Cli, application string, opt buildOptions) (refe
 		},
 	}
 
-	ctx2, cancel := context.WithCancel(ctx)
-	defer cancel()
-
-	pw := progress.NewPrinter(ctx2, os.Stderr, opt.progress)
+	pw := progress.NewPrinter(ctx, os.Stderr, opt.progress)
 
 	// We rely on buildx "docker" builder integrated in docker engine, so don't nee a DockerAPI here
-	resp, err := build.Build(ctx2, driverInfo, buildopts, nil, dockerCli.ConfigFile(), pw)
+	resp, err := build.Build(ctx, driverInfo, buildopts, nil, dockerCli.ConfigFile(), pw)
 	if err != nil {
 		return nil, err
 	}
 
 	fmt.Println("Successfully built service images")
 	updateBundle(bundle, resp)
 
-	var ref reference.Named
-	ref, err = packager.GetNamedTagged(opt.tag)
-	if err != nil {
-		return nil, err
-	}
 	if ref == nil {
 		if ref, err = computeDigest(bundle); err != nil {
 			return nil, err
@@ -143,6 +135,21 @@ func runBuild(dockerCli command.Cli, application string, opt buildOptions) (refe
 	return ref, nil
 }
 
+func checkMinimalEngineVersion(dockerCli command.Cli) error {
+	info, err := dockerCli.Client().Info(appcontext.Context())
+	if err != nil {
+		return err
+	}
+	majorVersion, err := strconv.Atoi(info.ServerVersion[:strings.IndexRune(info.ServerVersion, '.')])
+	if err != nil {
+		return err
+	}
+	if majorVersion < 19 {
+		return errors.New("'build' require docker engine 19.03 or later")
+	}
+	return nil
+}
+
 func updateBundle(bundle *bundle.Bundle, resp map[string]*client.SolveResponse) {
 	debugSolveResponses(resp)
 	for service, r := range resp {

internal/commands/build/compose.go

@@ -14,7 +14,6 @@ import (
 // parseCompose do parse app compose file and extract buildx Options
 // We don't rely on bake's ReadTargets + TargetsToBuildOpt here as we have to skip environment variable interpolation
 func parseCompose(app *types.App, options buildOptions) (map[string]build.Options, error) {
-
 	// Fixme can have > 1 composes ?
 	parsed, err := loader.ParseYAML(app.Composes()[0])
 	if err != nil {