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

#394: config: multiple yaml

Browse Source
This commit is contained in:
Muayyad alsadi 2021-12-31 01:54:32 +02:00
parent 31df70b8d2
commit 481c6d0a41
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
podman_compose.py
View File

@ -1094,7 +1094,7 @@ class PodmanCompose:
"COMPOSE_PROJECT_NAME": self.project_name, "COMPOSE_PROJECT_NAME": self.project_name,
"COMPOSE_PATH_SEPARATOR": pathsep, "COMPOSE_PATH_SEPARATOR": pathsep,
}) })
compose = {'_dirname': dirname} compose = {}
for filename in files: for filename in files:
with open(filename, 'r') as f: with open(filename, 'r') as f:
content = yaml.safe_load(f) content = yaml.safe_load(f)
@ -1106,6 +1106,8 @@ class PodmanCompose:
#log(filename, json.dumps(content, indent = 2)) #log(filename, json.dumps(content, indent = 2))
content = rec_subs(content, self.environ) content = rec_subs(content, self.environ)
rec_merge(compose, content) rec_merge(compose, content)
self.merged_yaml = yaml.safe_dump(compose)
compose['_dirname'] = dirname
# debug mode # debug mode
if len(files)>1: if len(files)>1:
log(" ** merged:\n", json.dumps(compose, indent = 2)) log(" ** merged:\n", json.dumps(compose, indent = 2))
@ -1659,9 +1661,7 @@ def compose_logs(compose, args):
@cmd_run(podman_compose, 'config', "displays the compose file") @cmd_run(podman_compose, 'config', "displays the compose file")
def compose_config(compose, args): def compose_config(compose, args):
file_path = getattr(args, 'file', [])[0] print(compose.merged_yaml)
f = open(file_path, "r")
print(f.read())
################### ###################
# command arguments parsing # command arguments parsing