opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 09:28:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

podman build --build-arg should fall back to environment

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

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2021-03-02 15:28:50 -05:00
parent 2c500a8145
commit 01ffe2c30a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/podman/images/build.go
View File

@ -317,11 +317,16 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil
av := strings.SplitN(arg, "=", 2) av := strings.SplitN(arg, "=", 2)
if len(av) > 1 { if len(av) > 1 {
args[av[0]] = av[1] args[av[0]] = av[1]
} else {
// 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 { } else {
delete(args, av[0]) delete(args, av[0])
} }
} }
} }
}
flags.Layers = buildOpts.Layers flags.Layers = buildOpts.Layers
// `buildah bud --layers=false` acts like `docker build --squash` does. // `buildah bud --layers=false` acts like `docker build --squash` does.