Use build-arg ENV val from local environment if set

If a user sets the ENV to be used with the build-arg flag in the local environment by exporting it, look it up and use the value set there for that ENV. Add tests to cover this use case as well. Signed-off-by: Urvashi Mohnani <[email protected]>
containers · Jan 25, 2021 · 173881f · 173881f
1 parent 1a04337
commit 173881f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/cmd/buildah/bud.go b/cmd/buildah/bud.go
@@ -129,7 +129,12 @@ func budCmd(c *cobra.Command, inputArgs []string, iopts budOptions) error {
 			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])
+				}
 			}
 		}
 	}

diff --git a/tests/bud.bats b/tests/bud.bats
@@ -1358,6 +1358,16 @@ function _test_http() {
   expect_output --substring "FROM alpine"
 }
 
+@test "bud with build arg ENV set in local environment" {
+   _prefetch alpine busybox
+  target=busybox-image
+  run_buildah bud --signature-policy ${TESTSDIR}/policy.json -t ${target} --build-arg foo=bar ${TESTSDIR}/bud/build-arg
+  expect_output --substring "bar"
+  export foo=hello-world
+  run_buildah bud --signature-policy ${TESTSDIR}/policy.json -t ${target} --build-arg foo ${TESTSDIR}/bud/build-arg
+  expect_output --substring "hello-world"
+}
+
 @test "bud with copy-from and cache" {
   _prefetch busybox
   target=busybox-image

diff --git a/tests/bud/build-arg/Dockerfile b/tests/bud/build-arg/Dockerfile
@@ -1,3 +1,3 @@
 FROM busybox
-
 ARG foo
+RUN echo $foo