From 359d5c8a7631a66cd1dc38e42fb741f1dc3c731a Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Tue, 3 Jul 2018 23:14:06 +0000 Subject: [PATCH] build: use strconv.ParseBool to parse DOCKER_BUILDKIT to allow value "0" Signed-off-by: Tibor Vass (cherry picked from commit 721000e6c9c311bda19a05813a7e89007a691777) Signed-off-by: Sebastiaan van Stijn --- cli/command/image/build.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cli/command/image/build.go b/cli/command/image/build.go index 6616e308b0..fc660faddc 100644 --- a/cli/command/image/build.go +++ b/cli/command/image/build.go @@ -13,6 +13,7 @@ import ( "path/filepath" "regexp" "runtime" + "strconv" "strings" "github.com/docker/cli/cli" @@ -176,8 +177,14 @@ func (out *lastProgressOutput) WriteProgress(prog progress.Progress) error { // nolint: gocyclo func runBuild(dockerCli command.Cli, options buildOptions) error { - if os.Getenv("DOCKER_BUILDKIT") != "" { - return runBuildBuildKit(dockerCli, options) + if buildkitEnv := os.Getenv("DOCKER_BUILDKIT"); buildkitEnv != "" { + enableBuildkit, err := strconv.ParseBool(buildkitEnv) + if err != nil { + return errors.Wrap(err, "DOCKER_BUILDKIT environment variable expects boolean value") + } + if enableBuildkit { + return runBuildBuildKit(dockerCli, options) + } } var (