mirror of
https://github.com/docker/compose.git
synced 2025-07-03 11:54:27 +02:00
minor improvement and fix
Signed-off-by: Mehrad Dadar <mehrad.dadar@gmail.com>
This commit is contained in:
parent
42c3adb236
commit
aeb7448449
@ -102,16 +102,18 @@ func (s *composeService) projectFromName(containers Containers, projectName stri
|
|||||||
if len(containers) == 0 {
|
if len(containers) == 0 {
|
||||||
return project, errors.New("no such project: " + projectName)
|
return project, errors.New("no such project: " + projectName)
|
||||||
}
|
}
|
||||||
set := map[string]types.ServiceConfig{}
|
set := map[string]*types.ServiceConfig{}
|
||||||
for _, c := range containers {
|
for _, c := range containers {
|
||||||
sc := types.ServiceConfig{
|
serviceLabel := c.Labels[api.ServiceLabel]
|
||||||
Name: c.Labels[api.ServiceLabel],
|
_, ok := set[serviceLabel]
|
||||||
|
if !ok {
|
||||||
|
set[serviceLabel] = &types.ServiceConfig{
|
||||||
|
Name: serviceLabel,
|
||||||
Image: c.Image,
|
Image: c.Image,
|
||||||
Labels: c.Labels,
|
Labels: c.Labels,
|
||||||
}
|
}
|
||||||
sc.Scale++
|
}
|
||||||
set[sc.Name] = sc
|
set[serviceLabel].Scale++
|
||||||
|
|
||||||
}
|
}
|
||||||
for _, service := range set {
|
for _, service := range set {
|
||||||
dependencies := service.Labels[api.DependenciesLabel]
|
dependencies := service.Labels[api.DependenciesLabel]
|
||||||
@ -129,7 +131,7 @@ func (s *composeService) projectFromName(containers Containers, projectName stri
|
|||||||
service.DependsOn[dependency] = types.ServiceDependency{Condition: condition}
|
service.DependsOn[dependency] = types.ServiceDependency{Condition: condition}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
project.Services = append(project.Services, service)
|
project.Services = append(project.Services, *service)
|
||||||
}
|
}
|
||||||
SERVICES:
|
SERVICES:
|
||||||
for _, qs := range services {
|
for _, qs := range services {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user