From 01ffe2c30ae7bcd83e5556dfdf2d657e6a4539c2 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Tue, 2 Mar 2021 15:28:50 -0500
Subject: [PATCH] podman build --build-arg should fall back to environment

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

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 cmd/podman/images/build.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
index 78cf4efd01..97eb966b7d 100644
--- a/cmd/podman/images/build.go
+++ b/cmd/podman/images/build.go
@@ -318,7 +318,12 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil
 			if len(av) > 1 {
 				args[av[0]] = av[1]
 			} else {
-				delete(args, av[0])
+				// check if the env is set in the local environment and use that value if it is
+				if val, present := os.LookupEnv(av[0]); present {
+					args[av[0]] = val
+				} else {
+					delete(args, av[0])
+				}
 			}
 		}
 	}