support build with docker cli (#1525)

* support build with docker cli

* change to DOCKER_BUILDKIT

pkg/utils/docker/build.go

@@ -18,8 +18,11 @@ package docker
 
 import (
 	"bytes"
+	"fmt"
 	"os"
+	"os/exec"
 	"path"
+	"strconv"
 	"strings"
 
 	dockerlib "github.com/fsouza/go-dockerclient"
@@ -34,13 +37,36 @@ type Build struct {
 }
 
 /*
-BuildImage builds a Docker image via the Docker API. Takes the source directory
+BuildImage builds a Docker image via the Docker API or Docker CLI.
-and image name and then builds the appropriate image. Tarball is utilized
+Takes the source directory and image name and then builds the appropriate image. Tarball is utilized
 in order to make building easier.
+
+if the DOCKER_BUILDKIT is '1', then we will use the docker CLI to build the image
 */
 func (c *Build) BuildImage(source string, image string, dockerfile string, buildargs []dockerlib.BuildArg) error {
 	log.Infof("Building image '%s' from directory '%s'", image, path.Base(source))
 
+	outputBuffer := bytes.NewBuffer(nil)
+	var err error
+
+	if usecli, _ := strconv.ParseBool(os.Getenv("DOCKER_BUILDKIT")); usecli {
+		err = buildDockerCli(source, image, dockerfile, buildargs, outputBuffer)
+	} else {
+		err = c.buildDockerClient(source, image, dockerfile, buildargs, outputBuffer)
+	}
+
+	log.Debugf("Image %s build output:\n%s", image, outputBuffer)
+
+	if err != nil {
+		return errors.Wrap(err, "Unable to build image. For more output, use -v or --verbose when converting.")
+	}
+
+	log.Infof("Image '%s' from directory '%s' built successfully", image, path.Base(source))
+
+	return nil
+}
+
+func (c *Build) buildDockerClient(source string, image string, dockerfile string, buildargs []dockerlib.BuildArg, outputBuffer *bytes.Buffer) error {
 	// Create a temporary file for tarball image packaging
 	tmpFile, err := os.CreateTemp(os.TempDir(), "kompose-image-build-")
 	if err != nil {
@@ -61,7 +87,6 @@ func (c *Build) BuildImage(source string, image string, dockerfile string, build
 	}
 
 	// Let's create all the options for the image building.
-	outputBuffer := bytes.NewBuffer(nil)
 	opts := dockerlib.BuildImageOptions{
 		Name:         image,
 		InputStream:  tarballSource,
@@ -71,14 +96,27 @@ func (c *Build) BuildImage(source string, image string, dockerfile string, build
 	}
 
 	// Build it!
-	err = c.Client.BuildImage(opts)
+	return c.Client.BuildImage(opts)
-	log.Debugf("Image %s build output:\n%s", image, outputBuffer)
+}
 
-	if err != nil {
+func buildDockerCli(source string, image string, dockerfile string, buildargs []dockerlib.BuildArg, outputBuffer *bytes.Buffer) error {
-		return errors.Wrap(err, "Unable to build image. For more output, use -v or --verbose when converting.")
+	args := []string{"build", "-t", image}
+
+	if dockerfile != "" {
+		args = append(args, "-f", dockerfile)
 	}
 
-	log.Infof("Image '%s' from directory '%s' built successfully", image, path.Base(source))
+	for _, buildarg := range buildargs {
+		args = append(args, "--build-arg", fmt.Sprintf("%s=%s", buildarg.Name, buildarg.Value))
+	}
 
-	return nil
+	args = append(args, source)
+
+	cmd := exec.Command("docker", args...)
+	cmd.Stdout = outputBuffer
+	cmd.Stderr = outputBuffer
+
+	log.Debugf("Image %s build calling command %v", image, cmd)
+
+	return cmd.Run()
 }