extern/podman-compose
1
0
Fork 1
mirror of https://github.com/containers/podman-compose.git synced 2025-02-14 01:09:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove incorrect os.chdir call to fix folder error

Browse Source 
Signed-off-by: notdian <dian@fishekqi.com>
This commit is contained in:
notdian 2025-01-27 21:55:15 +01:00 committed by Povilas Kanapickas
parent 51d180d2d0
commit e03d675b9b
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
newsfragments/1125.bugfix Normal file
View File

@ -0,0 +1 @@
- Fix handling of relative includes and extends

12
podman_compose.py
View File

@ -1925,9 +1925,6 @@ class PodmanCompose:
dotenv_path = os.path.realpath(args.env_file) dotenv_path = os.path.realpath(args.env_file)
dotenv_dict.update(dotenv_to_dict(dotenv_path)) dotenv_dict.update(dotenv_to_dict(dotenv_path))
# TODO: remove next line
os.chdir(dirname)
os.environ.update({ os.environ.update({
key: value for key, value in dotenv_dict.items() if key.startswith("PODMAN_") key: value for key, value in dotenv_dict.items() if key.startswith("PODMAN_")
}) })
@ -1969,11 +1966,18 @@ class PodmanCompose:
content = normalize(content) content = normalize(content)
# 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)
if isinstance(services := content.get('services'), dict):
for service in services.values():
if 'extends' in service and (service_file := service['extends'].get('file')):
service['extends']['file'] = os.path.join(
os.path.dirname(filename), service_file
)
rec_merge(compose, content) rec_merge(compose, content)
# If `include` is used, append included files to files # If `include` is used, append included files to files
include = compose.get("include") include = compose.get("include")
if include: if include:
files.extend(include) files.extend([os.path.join(os.path.dirname(filename), i) for i in include])
# As compose obj is updated and tested with every loop, not deleting `include` # As compose obj is updated and tested with every loop, not deleting `include`
# from it, results in it being tested again and again, original values for # from it, results in it being tested again and again, original values for
# `include` be appended to `files`, and, included files be processed for ever. # `include` be appended to `files`, and, included files be processed for ever.