mirror of
https://github.com/containers/podman-compose.git
synced 2025-01-23 14:28:46 +01:00
Merge pull request #1032 from shuckc/main
Revert "Use defined environment variables in the image build process"
This commit is contained in:
commit
229650cba8
@ -2408,10 +2408,6 @@ async def build_one(compose, args, cnt):
|
|||||||
build_args.append("--pull-always")
|
build_args.append("--pull-always")
|
||||||
elif getattr(args, "pull", None):
|
elif getattr(args, "pull", None):
|
||||||
build_args.append("--pull")
|
build_args.append("--pull")
|
||||||
env = dict(cnt.get("environment", {}))
|
|
||||||
for name, value in env.items():
|
|
||||||
build_args += ["--env", f"{name}" if value is None else f"{name}={value}"]
|
|
||||||
|
|
||||||
args_list = norm_as_list(build_desc.get("args", {}))
|
args_list = norm_as_list(build_desc.get("args", {}))
|
||||||
for build_arg in args_list + args.build_arg:
|
for build_arg in args_list + args.build_arg:
|
||||||
build_args.extend((
|
build_args.extend((
|
||||||
|
Loading…
Reference in New Issue
Block a user