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

Don’t show ACI sidecar in docker ps

Browse Source
This commit is contained in:
Guillaume Tardif 2020-06-18 15:51:13 +02:00
parent 3187120d94
commit 3f544f0e01
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
azure/backend.go
View File

@ -113,6 +113,10 @@ func (cs *aciContainerService) List(ctx context.Context, _ bool) ([]containers.C
for _, container := range *group.Containers { for _, container := range *group.Containers {
var containerID string var containerID string
// don't list sidecar container
if *container.Name == convert.ComposeDNSSidecarName {
continue
}
if *container.Name == singleContainerName { if *container.Name == singleContainerName {
containerID = *containerGroup.Name containerID = *containerGroup.Name
} else { } else {

11
azure/convert/convert.go
View File

@ -17,9 +17,8 @@ import (
) )
const ( const (
// ComposeDnsSidecarName name of the dns sidecar container // ComposeDNSSidecarName name of the dns sidecar container
ComposeDnsSidecarName = "aci--dns--sidecar" ComposeDNSSidecarName = "aci--dns--sidecar"
azureFileDriverName = "azure_file" azureFileDriverName = "azure_file"
volumeDriveroptsShareNameKey = "share_name" volumeDriveroptsShareNameKey = "share_name"
@ -99,7 +98,7 @@ func ToContainerGroup(aciContext store.AciContext, p compose.Project) (container
containers = append(containers, containerDefinition) containers = append(containers, containerDefinition)
} }
if len(containers) > 1 { if len(containers) > 1 {
dnsSideCar := getDnsSidecar(containers) dnsSideCar := getDNSSidecar(containers)
containers = append(containers, dnsSideCar) containers = append(containers, dnsSideCar)
} }
groupDefinition.ContainerGroupProperties.Containers = &containers groupDefinition.ContainerGroupProperties.Containers = &containers
@ -107,7 +106,7 @@ func ToContainerGroup(aciContext store.AciContext, p compose.Project) (container
return groupDefinition, nil return groupDefinition, nil
} }
func getDnsSidecar(containers []containerinstance.Container) containerinstance.Container { func getDNSSidecar(containers []containerinstance.Container) containerinstance.Container {
var commands []string var commands []string
for _, container := range containers { for _, container := range containers {
commands = append(commands, fmt.Sprintf("echo 127.0.0.1 %s >> /etc/hosts", *container.Name)) commands = append(commands, fmt.Sprintf("echo 127.0.0.1 %s >> /etc/hosts", *container.Name))
@ -117,7 +116,7 @@ func getDnsSidecar(containers []containerinstance.Container) containerinstance.C
commands = append(commands, "sleep infinity") commands = append(commands, "sleep infinity")
alpineCmd := []string{"sh", "-c", strings.Join(commands, ";")} alpineCmd := []string{"sh", "-c", strings.Join(commands, ";")}
dnsSideCar := containerinstance.Container{ dnsSideCar := containerinstance.Container{
Name: to.StringPtr(ComposeDnsSidecarName), Name: to.StringPtr(ComposeDNSSidecarName),
ContainerProperties: &containerinstance.ContainerProperties{ ContainerProperties: &containerinstance.ContainerProperties{
Image: to.StringPtr("alpine:3.12.0"), Image: to.StringPtr("alpine:3.12.0"),
Command: &alpineCmd, Command: &alpineCmd,