extern/podman-compose
1
0
Fork 1
mirror of https://github.com/containers/podman-compose.git synced 2025-05-30 06:59:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove never-shared options.

Browse Source
This commit is contained in:
Marius Hoch 2019-09-15 13:35:52 +02:00 committed by Muayyad Alsadi
parent 3e2381f040
commit 72c1992737
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
podman_compose.py
View File

@ -840,7 +840,7 @@ class PodmanCompose:
for service_name, service_desc in services.items(): for service_name, service_desc in services.items():
if not service_name in resolved_services and service_desc['extends']['service'] in resolved_services: if not service_name in resolved_services and service_desc['extends']['service'] in resolved_services:
cust_service_desc = service_desc cust_service_desc = service_desc
service_desc = resolved_services[service_desc['extends']['service']].copy() service_desc = resolved_services[service_desc['extends']['service']]
service_desc = self._merge_service_extends(service_desc, cust_service_desc) service_desc = self._merge_service_extends(service_desc, cust_service_desc)
del(service_desc['extends']) del(service_desc['extends'])
resolved_services[service_name] = service_desc resolved_services[service_name] = service_desc
@ -855,7 +855,14 @@ class PodmanCompose:
Merges the service description from custom into base, as described at Merges the service description from custom into base, as described at
https://docs.docker.com/compose/extends/#adding-and-overriding-configuration https://docs.docker.com/compose/extends/#adding-and-overriding-configuration
""" """
result = base
result = base.copy()
# These are never shared
result.pop('links', None)
result.pop('volumes_from', None)
result.pop('depends_on', None)
for key, value in custom.items(): for key, value in custom.items():
if key in ('ports', 'expose', 'external_links', 'dns', 'dns_search', 'tmpfs'): if key in ('ports', 'expose', 'external_links', 'dns', 'dns_search', 'tmpfs'):
if not key in result: if not key in result:
@ -877,7 +884,7 @@ class PodmanCompose:
custom_by_mount_path[label] = label_value custom_by_mount_path[label] = label_value
result[key] = list({**base_by_mount_path, **custom_by_mount_path}.values()) result[key] = list({**base_by_mount_path, **custom_by_mount_path}.values())
else: else:
# Single value option, replace # Single value or unshared option, replace
result[key] = value result[key] = value
return result return result