Skip to content

Commit aeb7448

Browse files
committed
minor improvement and fix
Signed-off-by: Mehrad Dadar <[email protected]>
1 parent 42c3adb commit aeb7448

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

pkg/compose/compose.go

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,16 +102,18 @@ func (s *composeService) projectFromName(containers Containers, projectName stri
102102
if len(containers) == 0 {
103103
return project, errors.New("no such project: " + projectName)
104104
}
105-
set := map[string]types.ServiceConfig{}
105+
set := map[string]*types.ServiceConfig{}
106106
for _, c := range containers {
107-
sc := types.ServiceConfig{
108-
Name: c.Labels[api.ServiceLabel],
109-
Image: c.Image,
110-
Labels: c.Labels,
107+
serviceLabel := c.Labels[api.ServiceLabel]
108+
_, ok := set[serviceLabel]
109+
if !ok {
110+
set[serviceLabel] = &types.ServiceConfig{
111+
Name: serviceLabel,
112+
Image: c.Image,
113+
Labels: c.Labels,
114+
}
111115
}
112-
sc.Scale++
113-
set[sc.Name] = sc
114-
116+
set[serviceLabel].Scale++
115117
}
116118
for _, service := range set {
117119
dependencies := service.Labels[api.DependenciesLabel]
@@ -129,7 +131,7 @@ func (s *composeService) projectFromName(containers Containers, projectName stri
129131
service.DependsOn[dependency] = types.ServiceDependency{Condition: condition}
130132
}
131133
}
132-
project.Services = append(project.Services, service)
134+
project.Services = append(project.Services, *service)
133135
}
134136
SERVICES:
135137
for _, qs := range services {

0 commit comments

Comments
 (0)