mirror of
https://github.com/docker/compose.git
synced 2025-07-28 16:14:06 +02:00
Fix project name getting overridden with service
This commit is contained in:
parent
2d2d81d33f
commit
5a46278f79
@ -31,8 +31,8 @@ class Project(object):
|
|||||||
# Reference links by object
|
# Reference links by object
|
||||||
links = []
|
links = []
|
||||||
if 'links' in service_dict:
|
if 'links' in service_dict:
|
||||||
for name in service_dict.get('links', []):
|
for service_name in service_dict.get('links', []):
|
||||||
links.append(project.get_service(name))
|
links.append(project.get_service(service_name))
|
||||||
del service_dict['links']
|
del service_dict['links']
|
||||||
project.services.append(Service(client=client, project=name, links=links, **service_dict))
|
project.services.append(Service(client=client, project=name, links=links, **service_dict))
|
||||||
return project
|
return project
|
||||||
@ -40,8 +40,8 @@ class Project(object):
|
|||||||
@classmethod
|
@classmethod
|
||||||
def from_config(cls, name, config, client):
|
def from_config(cls, name, config, client):
|
||||||
dicts = []
|
dicts = []
|
||||||
for name, service in config.items():
|
for service_name, service in config.items():
|
||||||
service['name'] = name
|
service['name'] = service_name
|
||||||
dicts.append(service)
|
dicts.append(service)
|
||||||
return cls.from_dicts(name, dicts, client)
|
return cls.from_dicts(name, dicts, client)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user