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

Add network alias to container name

Browse Source 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
This commit is contained in:
Ulysses Souza 2021-01-06 15:15:15 -03:00
parent b264e1814b
commit b3993230d1
7 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
local/compose/attach.go
View File

@ -45,7 +45,7 @@ func (s *composeService) attach(ctx context.Context, project *types.Project, con
var names []string var names []string
for _, c := range containers { for _, c := range containers {
names = append(names, getContainerName(c)) names = append(names, getCanonicalContainerName(c))
} }
fmt.Printf("Attaching to %s\n", strings.Join(names, ", ")) fmt.Printf("Attaching to %s\n", strings.Join(names, ", "))
@ -61,7 +61,7 @@ func (s *composeService) attach(ctx context.Context, project *types.Project, con
func (s *composeService) attachContainer(ctx context.Context, container moby.Container, consumer compose.LogConsumer, project *types.Project) error { func (s *composeService) attachContainer(ctx context.Context, container moby.Container, consumer compose.LogConsumer, project *types.Project) error {
serviceName := container.Labels[serviceLabel] serviceName := container.Labels[serviceLabel]
w := getWriter(serviceName, getContainerName(container), consumer) w := getWriter(serviceName, getCanonicalContainerName(container), consumer)
service, err := project.GetService(serviceName) service, err := project.GetService(serviceName)
if err != nil { if err != nil {

5
local/compose/compose.go
View File

@ -25,10 +25,11 @@ import (
"github.com/docker/compose-cli/api/compose" "github.com/docker/compose-cli/api/compose"
"github.com/compose-spec/compose-go/types" "github.com/compose-spec/compose-go/types"
errdefs2 "github.com/docker/compose-cli/errdefs"
moby "github.com/docker/docker/api/types" moby "github.com/docker/docker/api/types"
"github.com/docker/docker/client" "github.com/docker/docker/client"
"github.com/sanathkr/go-yaml" "github.com/sanathkr/go-yaml"
errdefs2 "github.com/docker/compose-cli/errdefs"
) )
// NewComposeService create a local implementation of the compose.Service API // NewComposeService create a local implementation of the compose.Service API
@ -44,7 +45,7 @@ func (s *composeService) Up(ctx context.Context, project *types.Project, options
return errdefs2.ErrNotImplemented return errdefs2.ErrNotImplemented
} }
func getContainerName(c moby.Container) string { func getCanonicalContainerName(c moby.Container) string {
// Names return container canonical name /foo + link aliases /linked_by/foo // Names return container canonical name /foo + link aliases /linked_by/foo
for _, name := range c.Names { for _, name := range c.Names {
if strings.LastIndex(name, "/") == 0 { if strings.LastIndex(name, "/") == 0 {

2
local/compose/containers.go
View File

@ -66,7 +66,7 @@ func (containers Containers) split(predicate containerPredicate) (Containers, Co
func (containers Containers) names() []string { func (containers Containers) names() []string {
var names []string var names []string
for _, c := range containers { for _, c := range containers {
names = append(names, getContainerName(c)) names = append(names, getCanonicalContainerName(c))
} }
return names return names
} }

30
local/compose/convergence.go
View File

@ -57,7 +57,7 @@ func (s *composeService) ensureScale(ctx context.Context, actual []moby.Containe
missing := scale - len(actual) missing := scale - len(actual)
for i := 0; i < missing; i++ { for i := 0; i < missing; i++ {
number := next + i number := next + i
name := getContainerLogPrefix(project.Name, service, number) name := getContainerName(project.Name, service, number)
eg.Go(func() error { eg.Go(func() error {
return s.createContainer(ctx, project, service, name, number, false) return s.createContainer(ctx, project, service, name, number, false)
}) })
@ -109,7 +109,7 @@ func (s *composeService) ensureService(ctx context.Context, observedState Contai
for _, container := range actual { for _, container := range actual {
container := container container := container
name := getContainerName(container) name := getCanonicalContainerName(container)
diverged := container.Labels[configHashLabel] != expected diverged := container.Labels[configHashLabel] != expected
if diverged || service.Extensions[extLifecycle] == forceRecreate { if diverged || service.Extensions[extLifecycle] == forceRecreate {
@ -135,7 +135,7 @@ func (s *composeService) ensureService(ctx context.Context, observedState Contai
return eg.Wait() return eg.Wait()
} }
func getContainerLogPrefix(projectName string, service types.ServiceConfig, number int) string { func getContainerName(projectName string, service types.ServiceConfig, number int) string {
name := fmt.Sprintf("%s_%s_%d", projectName, service.Name, number) name := fmt.Sprintf("%s_%s_%d", projectName, service.Name, number)
if service.ContainerName != "" { if service.ContainerName != "" {
name = service.ContainerName name = service.ContainerName
@ -218,12 +218,12 @@ func (s *composeService) createContainer(ctx context.Context, project *types.Pro
func (s *composeService) recreateContainer(ctx context.Context, project *types.Project, service types.ServiceConfig, container moby.Container) error { func (s *composeService) recreateContainer(ctx context.Context, project *types.Project, service types.ServiceConfig, container moby.Container) error {
w := progress.ContextWriter(ctx) w := progress.ContextWriter(ctx)
w.Event(progress.NewEvent(getContainerName(container), progress.Working, "Recreate")) w.Event(progress.NewEvent(getCanonicalContainerName(container), progress.Working, "Recreate"))
err := s.apiClient.ContainerStop(ctx, container.ID, nil) err := s.apiClient.ContainerStop(ctx, container.ID, nil)
if err != nil { if err != nil {
return err return err
} }
name := getContainerName(container) name := getCanonicalContainerName(container)
tmpName := fmt.Sprintf("%s_%s", container.ID[:12], name) tmpName := fmt.Sprintf("%s_%s", container.ID[:12], name)
err = s.apiClient.ContainerRename(ctx, container.ID, tmpName) err = s.apiClient.ContainerRename(ctx, container.ID, tmpName)
if err != nil { if err != nil {
@ -241,7 +241,7 @@ func (s *composeService) recreateContainer(ctx context.Context, project *types.P
if err != nil { if err != nil {
return err return err
} }
w.Event(progress.NewEvent(getContainerName(container), progress.Done, "Recreated")) w.Event(progress.NewEvent(getCanonicalContainerName(container), progress.Done, "Recreated"))
setDependentLifecycle(project, service.Name, forceRecreate) setDependentLifecycle(project, service.Name, forceRecreate)
return nil return nil
} }
@ -261,12 +261,12 @@ func setDependentLifecycle(project *types.Project, service string, strategy stri
func (s *composeService) restartContainer(ctx context.Context, container moby.Container) error { func (s *composeService) restartContainer(ctx context.Context, container moby.Container) error {
w := progress.ContextWriter(ctx) w := progress.ContextWriter(ctx)
w.Event(progress.NewEvent(getContainerName(container), progress.Working, "Restart")) w.Event(progress.NewEvent(getCanonicalContainerName(container), progress.Working, "Restart"))
err := s.apiClient.ContainerStart(ctx, container.ID, moby.ContainerStartOptions{}) err := s.apiClient.ContainerStart(ctx, container.ID, moby.ContainerStartOptions{})
if err != nil { if err != nil {
return err return err
} }
w.Event(progress.NewEvent(getContainerName(container), progress.Done, "Restarted")) w.Event(progress.NewEvent(getCanonicalContainerName(container), progress.Done, "Restarted"))
return nil return nil
} }
@ -281,8 +281,8 @@ func (s *composeService) createMobyContainer(ctx context.Context, project *types
} }
id := created.ID id := created.ID
for netName := range service.Networks { for netName := range service.Networks {
network := project.Networks[netName] netwrk := project.Networks[netName]
err = s.connectContainerToNetwork(ctx, id, service.Name, network.Name) err = s.connectContainerToNetwork(ctx, id, netwrk.Name, service.Name, getContainerName(project.Name, service, number))
if err != nil { if err != nil {
return err return err
} }
@ -290,9 +290,9 @@ func (s *composeService) createMobyContainer(ctx context.Context, project *types
return nil return nil
} }
func (s *composeService) connectContainerToNetwork(ctx context.Context, id string, service string, n string) error { func (s *composeService) connectContainerToNetwork(ctx context.Context, id string, netwrk string, aliases ...string) error {
err := s.apiClient.NetworkConnect(ctx, n, id, &network.EndpointSettings{ err := s.apiClient.NetworkConnect(ctx, netwrk, id, &network.EndpointSettings{
Aliases: []string{service}, Aliases: aliases,
}) })
if err != nil { if err != nil {
return err return err
@ -352,10 +352,10 @@ func (s *composeService) startService(ctx context.Context, project *types.Projec
} }
eg.Go(func() error { eg.Go(func() error {
w := progress.ContextWriter(ctx) w := progress.ContextWriter(ctx)
w.Event(progress.StartingEvent(getContainerName(container))) w.Event(progress.StartingEvent(getCanonicalContainerName(container)))
err := s.apiClient.ContainerStart(ctx, container.ID, moby.ContainerStartOptions{}) err := s.apiClient.ContainerStart(ctx, container.ID, moby.ContainerStartOptions{})
if err == nil { if err == nil {
w.Event(progress.StartedEvent(getContainerName(container))) w.Event(progress.StartedEvent(getCanonicalContainerName(container)))
} }
return err return err
}) })

6
local/compose/create.go
View File

@ -213,7 +213,7 @@ func getCreateOptions(p *types.Project, s types.ServiceConfig, number int, inher
Resources: resources, Resources: resources,
} }
networkConfig := buildDefaultNetworkConfig(s, networkMode) networkConfig := buildDefaultNetworkConfig(s, networkMode, getContainerName(p.Name, s, number))
return &containerConfig, &hostConfig, networkConfig, nil return &containerConfig, &hostConfig, networkConfig, nil
} }
@ -359,11 +359,11 @@ func buildTmpfsOptions(tmpfs *types.ServiceVolumeTmpfs) *mount.TmpfsOptions {
} }
} }
func buildDefaultNetworkConfig(s types.ServiceConfig, networkMode container.NetworkMode) *network.NetworkingConfig { func buildDefaultNetworkConfig(s types.ServiceConfig, networkMode container.NetworkMode, containerName string) *network.NetworkingConfig {
config := map[string]*network.EndpointSettings{} config := map[string]*network.EndpointSettings{}
net := string(networkMode) net := string(networkMode)
config[net] = &network.EndpointSettings{ config[net] = &network.EndpointSettings{
Aliases: getAliases(s, s.Networks[net]), Aliases: append(getAliases(s, s.Networks[net]), containerName),
} }
return &network.NetworkingConfig{ return &network.NetworkingConfig{

2
local/compose/down.go
View File

@ -94,7 +94,7 @@ func (s *composeService) removeContainers(ctx context.Context, w progress.Writer
for _, container := range containers { for _, container := range containers {
toDelete := container toDelete := container
eg.Go(func() error { eg.Go(func() error {
eventName := "Container " + getContainerName(toDelete) eventName := "Container " + getCanonicalContainerName(toDelete)
w.Event(progress.StoppingEvent(eventName)) w.Event(progress.StoppingEvent(eventName))
err := s.apiClient.ContainerStop(ctx, toDelete.ID, nil) err := s.apiClient.ContainerStop(ctx, toDelete.ID, nil)
if err != nil { if err != nil {

5
local/compose/ps.go
View File

@ -21,9 +21,10 @@ import (
"fmt" "fmt"
"sort" "sort"
"github.com/docker/compose-cli/api/compose"
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/compose-cli/api/compose"
) )
func (s *composeService) Ps(ctx context.Context, projectName string) ([]compose.ContainerSummary, error) { func (s *composeService) Ps(ctx context.Context, projectName string) ([]compose.ContainerSummary, error) {
@ -54,7 +55,7 @@ func (s *composeService) Ps(ctx context.Context, projectName string) ([]compose.
summary = append(summary, compose.ContainerSummary{ summary = append(summary, compose.ContainerSummary{
ID: c.ID, ID: c.ID,
Name: getContainerName(c), Name: getCanonicalContainerName(c),
Project: c.Labels[projectLabel], Project: c.Labels[projectLabel],
Service: c.Labels[serviceLabel], Service: c.Labels[serviceLabel],
State: c.State, State: c.State,