holm/podman-compose
1
0
Fork 0
forked from extern/podman-compose
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'devel' into allow-config-to-merge-strings-and-dicts-in-build

Browse Source 
Signed-off-by: Sergei Biriukov <svbiriukov@gmail.com>
This commit is contained in:
Sergei Biriukov
2023-05-06 18:10:29 +10:00
parent 85d5d5dcc9 79bfad103c
commit cfd24cc2e8
5 changed files with 129 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
podman_compose.py
View File

@ -1253,6 +1253,10 @@ def normalize_service(service, sub_dir=""):
if not context:
context = "."
service["build"]["context"] = context
for key in ("command", "entrypoint"):
if key in service:
if is_str(service[key]):
service[key] = shlex.split(service[key])
for key in ("env_file", "security_opt", "volumes"):
if key not in service:
continue
@ -1305,14 +1309,14 @@ def rec_merge_one(target, source):
if key not in source:
continue
value2 = source[key]
if key == "command":
if key in ("command", "entrypoint"):
target[key] = clone(value2)
continue
if not isinstance(value2, type(value)):
value_type = type(value)
value2_type = type(value2)
raise ValueError(
f"can't merge value of {key} of type {value_type} and {value2_type}"
f"can't merge value of [{key}] of type {value_type} and {value2_type}"
)
if is_list(value2):
if key == "volumes":