tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: removed redundant code 

Signed-off-by: Mehrad Dadar <mehrad.dadar@gmail.com>
This commit is contained in:
Mehrad Dadar 2022-02-17 07:55:11 +03:30
parent 65ed8cf4c2
commit ced9eba940
3 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/compose/compose.go
View File

@ -115,7 +115,7 @@ func (s *composeService) projectFromName(containers Containers, projectName stri
if len(dependencies) > 0 { if len(dependencies) > 0 {
service.DependsOn = types.DependsOnConfig{} service.DependsOn = types.DependsOnConfig{}
for _, d := range strings.Split(dependencies, ",") { for _, d := range strings.Split(dependencies, ",") {
service.DependsOn[d] = types.ServiceDependency{} service.DependsOn[d] = types.ServiceDependency{Condition: ServiceConditionRunningOrHealthy}
} }
} }
project.Services = append(project.Services, service) project.Services = append(project.Services, service)

37
pkg/compose/down.go
View File

@ -41,6 +41,7 @@ func (s *composeService) Down(ctx context.Context, projectName string, options a
} }
func (s *composeService) down(ctx context.Context, projectName string, options api.DownOptions) error { func (s *composeService) down(ctx context.Context, projectName string, options api.DownOptions) error {
builtFromResources := options.Project == nil
w := progress.ContextWriter(ctx) w := progress.ContextWriter(ctx)
resourceToRemove := false resourceToRemove := false
@ -50,8 +51,8 @@ func (s *composeService) down(ctx context.Context, projectName string, options a
return err return err
} }
if options.Project == nil { if builtFromResources {
options.Project, err = s.projectFromLabels(ctx, containers.filter(isNotOneOff), projectName) options.Project, err = s.getProjectWithVolumes(ctx, containers, projectName)
if err != nil { if err != nil {
return err return err
} }
@ -232,34 +233,9 @@ func (s *composeService) removeContainers(ctx context.Context, w progress.Writer
return eg.Wait() return eg.Wait()
} }
// projectFromLabels builds a types.Project based on actual resources with compose labels set func (s *composeService) getProjectWithVolumes(ctx context.Context, containers Containers, projectName string) (*types.Project, error) {
func (s *composeService) projectFromLabels(ctx context.Context, containers Containers, projectName string) (*types.Project, error) { containers = containers.filter(isNotOneOff)
project := &types.Project{ project := s.projectFromName(containers, projectName)
Name: projectName,
}
if len(containers) == 0 {
return project, nil
}
set := map[string]moby.Container{}
for _, c := range containers {
set[c.Labels[api.ServiceLabel]] = c
}
for s, c := range set {
service := types.ServiceConfig{
Name: s,
Image: c.Image,
Labels: c.Labels,
}
dependencies := c.Labels[api.DependenciesLabel]
if len(dependencies) > 0 {
service.DependsOn = types.DependsOnConfig{}
for _, d := range strings.Split(dependencies, ",") {
service.DependsOn[d] = types.ServiceDependency{}
}
}
project.Services = append(project.Services, service)
}
volumes, err := s.apiClient.VolumeList(ctx, filters.NewArgs(projectFilter(projectName))) volumes, err := s.apiClient.VolumeList(ctx, filters.NewArgs(projectFilter(projectName)))
if err != nil { if err != nil {
return nil, err return nil, err
@ -273,6 +249,5 @@ func (s *composeService) projectFromLabels(ctx context.Context, containers Conta
Labels: vol.Labels, Labels: vol.Labels,
} }
} }
return project, nil return project, nil
} }

2
pkg/compose/start.go
View File

@ -36,7 +36,7 @@ func (s *composeService) Start(ctx context.Context, projectName string, options
func (s *composeService) start(ctx context.Context, projectName string, options api.StartOptions, listener api.ContainerEventListener) error { func (s *composeService) start(ctx context.Context, projectName string, options api.StartOptions, listener api.ContainerEventListener) error {
var containers Containers var containers Containers
containers, err := s.getContainers(ctx, projectName, oneOffInclude, true, options.AttachTo...) containers, err := s.getContainers(ctx, projectName, oneOffExclude, true, options.AttachTo...)
if err != nil { if err != nil {
return err return err
} }