tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-25 22:54:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do not inspect for double container name at creation time, this has already been checked, let moby error bubble up if there is a name clash at this stage

Browse Source 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
This commit is contained in:
Guillaume Tardif 2021-01-08 10:59:58 +01:00
parent 0021b14de8
commit 7a6712afdb
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
local/compose/convergence.go
View File

@ -26,7 +26,6 @@ import (
moby "github.com/docker/docker/api/types" moby "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"github.com/docker/docker/client"
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
status "github.com/docker/compose-cli/local/moby" status "github.com/docker/compose-cli/local/moby"
@ -42,11 +41,6 @@ const (
"Remove the custom name to scale the service.\n" "Remove the custom name to scale the service.\n"
) )
func containerExists(ctx context.Context, c *client.Client, name string) bool {
container, err := c.ContainerInspect(ctx, name)
return err == nil && container.ContainerJSONBase != nil && container.Name == "/"+name
}
func (s *composeService) ensureScale(ctx context.Context, actual []moby.Container, scale int, project *types.Project, service types.ServiceConfig) (*errgroup.Group, []moby.Container, error) { func (s *composeService) ensureScale(ctx context.Context, actual []moby.Container, scale int, project *types.Project, service types.ServiceConfig) (*errgroup.Group, []moby.Container, error) {
eg, _ := errgroup.WithContext(ctx) eg, _ := errgroup.WithContext(ctx)
if len(actual) < scale { if len(actual) < scale {
@ -81,16 +75,7 @@ func (s *composeService) ensureScale(ctx context.Context, actual []moby.Containe
} }
func (s *composeService) ensureService(ctx context.Context, observedState Containers, project *types.Project, service types.ServiceConfig) error { func (s *composeService) ensureService(ctx context.Context, observedState Containers, project *types.Project, service types.ServiceConfig) error {
actual, err := s.apiClient.ContainerList(ctx, moby.ContainerListOptions{ actual := observedState.filter(isService(service.Name))
Filters: filters.NewArgs(
projectFilter(project.Name),
serviceFilter(service.Name),
),
All: true,
})
if err != nil {
return err
}
scale, err := getScale(service) scale, err := getScale(service)
if err != nil { if err != nil {
@ -201,11 +186,6 @@ func getScale(config types.ServiceConfig) (int, error) {
} }
func (s *composeService) createContainer(ctx context.Context, project *types.Project, service types.ServiceConfig, name string, number int, autoRemove bool) error { func (s *composeService) createContainer(ctx context.Context, project *types.Project, service types.ServiceConfig, name string, number int, autoRemove bool) error {
if containerExists(ctx, s.apiClient, name) {
return fmt.Errorf(doubledContainerNameWarning,
service.Name,
name)
}
w := progress.ContextWriter(ctx) w := progress.ContextWriter(ctx)
w.Event(progress.CreatingEvent(name)) w.Event(progress.CreatingEvent(name))
err := s.createMobyContainer(ctx, project, service, name, number, nil, autoRemove) err := s.createMobyContainer(ctx, project, service, name, number, nil, autoRemove)