combine refactor sections

Topic: refactor-for-podman

Signed-off-by: andrew <andrew@anyscale.com>

Author: andrew-anyscale

wanda/container_cmd.go

@@ -105,6 +105,11 @@ func (c *baseContainerCmd) tag(src, asTag string) error {
 }
 
 func (c *baseContainerCmd) build(in *buildInput, core *buildInputCore, hints *buildInputHints) error {
+	return c.doBuild(in, core, hints, nil)
+}
+
+// doBuild is the common build implementation that accepts extra flags.
+func (c *baseContainerCmd) doBuild(in *buildInput, core *buildInputCore, hints *buildInputHints, extraFlags []string) error {
 	if hints == nil {
 		hints = newBuildInputHints(nil)
 	}
@@ -132,6 +137,7 @@ func (c *baseContainerCmd) build(in *buildInput, core *buildInputCore, hints *bu
 	// Build the image.
 	var args []string
 	args = append(args, "build")
+	args = append(args, extraFlags...)
 	args = append(args, "-f", core.Dockerfile)
 
 	for _, t := range in.tagList() {

wanda/docker_cmd.go

@@ -2,10 +2,7 @@ package wanda
 
 import (
 	"fmt"
-	"log"
 	"os"
-	"sort"
-	"strings"
 )
 
 func dockerCmdEnvs() []string {
@@ -66,71 +63,9 @@ func NewDockerCmd(config *DockerCmdConfig) ContainerCmd {
 
 // build overrides baseContainerCmd.build to add --progress=plain for BuildKit.
 func (c *dockerCmd) build(in *buildInput, core *buildInputCore, hints *buildInputHints) error {
-	if hints == nil {
-		hints = newBuildInputHints(nil)
-	}
-
-	// Pull down the required images, and tag them properly.
-	var froms []string
-	for from := range core.Froms {
-		froms = append(froms, from)
-	}
-	sort.Strings(froms)
-
-	for _, from := range froms {
-		src, ok := in.froms[from]
-		if !ok {
-			return fmt.Errorf("missing base image source for %q", from)
-		}
-		if src.local != "" { // local image, already ready.
-			continue
-		}
-		if err := c.pull(src.src, src.name); err != nil {
-			return fmt.Errorf("pull %s(%s): %w", src.name, src.src, err)
-		}
-	}
-	// TODO(aslonnie): maybe recheck all the IDs of the from images?
-
-	// Build the image.
-	var args []string
-	args = append(args, "build")
+	var extraFlags []string
 	if !c.useLegacyEngine {
-		args = append(args, "--progress=plain")
-	}
-	args = append(args, "-f", core.Dockerfile)
-
-	for _, t := range in.tagList() {
-		args = append(args, "-t", t)
+		extraFlags = append(extraFlags, "--progress=plain")
 	}
-
-	buildArgs := make(map[string]string)
-	for k, v := range hints.BuildArgs {
-		buildArgs[k] = v
-	}
-	// non-hint args can overwrite hint args
-	for k, v := range core.BuildArgs {
-		buildArgs[k] = v
-	}
-
-	var buildArgKeys []string
-	for k := range buildArgs {
-		buildArgKeys = append(buildArgKeys, k)
-	}
-	sort.Strings(buildArgKeys)
-	for _, k := range buildArgKeys {
-		v := buildArgs[k]
-		args = append(args, "--build-arg", fmt.Sprintf("%s=%s", k, v))
-	}
-
-	// read context from stdin
-	args = append(args, "-")
-
-	log.Printf("%s %s", c.bin, strings.Join(args, " "))
-
-	buildCmd := c.cmd(args...)
-	if in.context != nil {
-		buildCmd.Stdin = newWriterToReader(in.context)
-	}
-
-	return buildCmd.Run()
+	return c.doBuild(in, core, hints, extraFlags)
 }