Merge pull request #2400 from rhatdan/pull

Switch defaults for podman build versus buildah

1 files changed, 22 insertions, 2 deletions

diff --git a/cmd/podman/build.go b/cmd/podman/build.go
index 2054381ec..be85f4373 100644
--- a/cmd/podman/build.go
+++ b/cmd/podman/build.go
@@ -52,12 +52,22 @@ func init() {
 	flags := buildCommand.Flags()
 	flags.SetInterspersed(false)
 
-	flags.BoolVar(&layerValues.ForceRm, "force-rm", true, "Always remove intermediate containers after a build, even if the build is unsuccessful. (default true)")
-	flags.BoolVar(&layerValues.Layers, "layers", true, "Cache intermediate layers during build. Use BUILDAH_LAYERS environment variable to override")
 	budFlags := buildahcli.GetBudFlags(&budFlagsValues)
+	flag := budFlags.Lookup("pull-always")
+	flag.Value.Set("true")
+	flag.DefValue = "true"
+	layerFlags := buildahcli.GetLayerFlags(&layerValues)
+	flag = layerFlags.Lookup("layers")
+	flag.Value.Set(useLayers())
+	flag.DefValue = (useLayers())
+	flag = layerFlags.Lookup("force-rm")
+	flag.Value.Set("true")
+	flag.DefValue = "true"
+
 	fromAndBugFlags := buildahcli.GetFromAndBudFlags(&fromAndBudValues, &userNSValues, &namespaceValues)
 
 	flags.AddFlagSet(&budFlags)
+	flags.AddFlagSet(&layerFlags)
 	flags.AddFlagSet(&fromAndBugFlags)
 }
 
@@ -272,3 +282,13 @@ func Tail(a []string) []string {
 	}
 	return []string{}
 }
+
+// useLayers returns false if BUILDAH_LAYERS is set to "0" or "false"
+// otherwise it returns true
+func useLayers() string {
+	layers := os.Getenv("BUILDAH_LAYERS")
+	if strings.ToLower(layers) == "false" || layers == "0" {
+		return "false"
+	}
+	return "true"
+}