From 0154f9e9b3d158dce901c9f19261714660a2f27b Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Tue, 8 Dec 2020 16:26:51 -0500
Subject: Honor the --layers flag

Currently the --layers flag set by the user is ignored, and only the BUILDAH_LAYERS
environment variable being set is observed.

Fixes: https://github.com/containers/podman/issues/8643

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 cmd/podman/images/build.go              |  7 ++----
 pkg/api/handlers/compat/images_build.go |  2 ++
 pkg/bindings/images/build.go            |  3 +++
 test/system/070-build.bats              | 42 +++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
index 739e1c265..beb994f10 100644
--- a/cmd/podman/images/build.go
+++ b/cmd/podman/images/build.go
@@ -115,6 +115,7 @@ func buildFlags(cmd *cobra.Command) {
 	// --layers flag
 	flag = layerFlags.Lookup("layers")
 	useLayersVal := useLayers()
+	buildOpts.Layers = useLayersVal == "true"
 	if err := flag.Value.Set(useLayersVal); err != nil {
 		logrus.Errorf("unable to set --layers to %v: %v", useLayersVal, err)
 	}
@@ -274,11 +275,7 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil
 			}
 		}
 	}
-	// Check to see if the BUILDAH_LAYERS environment variable is set and
-	// override command-line.
-	if _, ok := os.LookupEnv("BUILDAH_LAYERS"); ok {
-		flags.Layers = true
-	}
+	flags.Layers = buildOpts.Layers
 
 	// `buildah bud --layers=false` acts like `docker build --squash` does.
 	// That is all of the new layers created during the build process are
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go
index 43478c1d3..415ff85cd 100644
--- a/pkg/api/handlers/compat/images_build.go
+++ b/pkg/api/handlers/compat/images_build.go
@@ -71,6 +71,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
 		ForceRm     bool     `schema:"forcerm"`
 		HTTPProxy   bool     `schema:"httpproxy"`
 		Labels      string   `schema:"labels"`
+		Layers      bool     `schema:"layers"`
 		MemSwap     int64    `schema:"memswap"`
 		Memory      int64    `schema:"memory"`
 		NetworkMode string   `schema:"networkmode"`
@@ -165,6 +166,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
 		Registry:                       query.Registry,
 		IgnoreUnrecognizedInstructions: true,
 		Quiet:                          query.Quiet,
+		Layers:                         query.Layers,
 		Isolation:                      buildah.IsolationChroot,
 		Compression:                    archive.Gzip,
 		Args:                           buildArgs,
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go
index 815ab4e86..d34ab87d9 100644
--- a/pkg/bindings/images/build.go
+++ b/pkg/bindings/images/build.go
@@ -41,6 +41,9 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
 	if options.NoCache {
 		params.Set("nocache", "1")
 	}
+	if options.Layers {
+		params.Set("layers", "1")
+	}
 	//	 TODO cachefrom
 	if options.PullPolicy == buildah.PullAlways {
 		params.Set("pull", "1")
diff --git a/test/system/070-build.bats b/test/system/070-build.bats
index 59da503a6..8e9a2d613 100644
--- a/test/system/070-build.bats
+++ b/test/system/070-build.bats
@@ -381,6 +381,48 @@ a${random3}z"
     run_podman rmi -f build_test
 }
 
+@test "podman build --layers test" {
+    rand_content=$(random_string 50)
+    tmpdir=$PODMAN_TMPDIR/build-test
+    run mkdir -p $tmpdir
+    containerfile=$tmpdir/Containerfile
+    cat >$containerfile <<EOF
+FROM $IMAGE
+RUN echo $rand_content
+EOF
+
+    # Build twice to make sure second time uses cache
+    run_podman build -t build_test $tmpdir
+    if [[ "$output" =~ "Using cache" ]]; then
+        is "$output" "[no instance of 'Using cache']" "no cache used"
+    fi
+
+    run_podman build -t build_test $tmpdir
+    is "$output" ".*cache" "used cache"
+
+    run_podman build -t build_test --layers=true $tmpdir
+    is "$output" ".*cache" "used cache"
+
+    run_podman build -t build_test --layers=false $tmpdir
+    if [[ "$output" =~ "Using cache" ]]; then
+        is "$output" "[no instance of 'Using cache']" "no cache used"
+    fi
+
+    BUILDAH_LAYERS=false run_podman build -t build_test $tmpdir
+    if [[ "$output" =~ "Using cache" ]]; then
+        is "$output" "[no instance of 'Using cache']" "no cache used"
+    fi
+
+    BUILDAH_LAYERS=false run_podman build -t build_test --layers=1 $tmpdir
+    is "$output" ".*cache" "used cache"
+
+    BUILDAH_LAYERS=1 run_podman build -t build_test --layers=false $tmpdir
+    if [[ "$output" =~ "Using cache" ]]; then
+        is "$output" "[no instance of 'Using cache']" "no cache used"
+    fi
+
+    run_podman rmi -a --force
+}
 
 function teardown() {
     # A timeout or other error in 'build' can leave behind stale images
-- 
cgit v1.2.3-54-g00ecf