From 3f544f0e01cb75010a653c276e26d32d066c4734 Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Thu, 18 Jun 2020 15:51:13 +0200 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20show=20ACI=20sidecar=20in=20`do?= =?UTF-8?q?cker=20ps`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- azure/backend.go | 4 ++++ azure/convert/convert.go | 11 +++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/azure/backend.go b/azure/backend.go index ac15d41cd..1cece518a 100644 --- a/azure/backend.go +++ b/azure/backend.go @@ -113,6 +113,10 @@ func (cs *aciContainerService) List(ctx context.Context, _ bool) ([]containers.C for _, container := range *group.Containers { var containerID string + // don't list sidecar container + if *container.Name == convert.ComposeDNSSidecarName { + continue + } if *container.Name == singleContainerName { containerID = *containerGroup.Name } else { diff --git a/azure/convert/convert.go b/azure/convert/convert.go index 0802fa83a..629734c4f 100644 --- a/azure/convert/convert.go +++ b/azure/convert/convert.go @@ -17,9 +17,8 @@ import ( ) const ( - // ComposeDnsSidecarName name of the dns sidecar container - ComposeDnsSidecarName = "aci--dns--sidecar" - + // ComposeDNSSidecarName name of the dns sidecar container + ComposeDNSSidecarName = "aci--dns--sidecar" azureFileDriverName = "azure_file" volumeDriveroptsShareNameKey = "share_name" @@ -99,7 +98,7 @@ func ToContainerGroup(aciContext store.AciContext, p compose.Project) (container containers = append(containers, containerDefinition) } if len(containers) > 1 { - dnsSideCar := getDnsSidecar(containers) + dnsSideCar := getDNSSidecar(containers) containers = append(containers, dnsSideCar) } groupDefinition.ContainerGroupProperties.Containers = &containers @@ -107,7 +106,7 @@ func ToContainerGroup(aciContext store.AciContext, p compose.Project) (container return groupDefinition, nil } -func getDnsSidecar(containers []containerinstance.Container) containerinstance.Container { +func getDNSSidecar(containers []containerinstance.Container) containerinstance.Container { var commands []string for _, container := range containers { 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") alpineCmd := []string{"sh", "-c", strings.Join(commands, ";")} dnsSideCar := containerinstance.Container{ - Name: to.StringPtr(ComposeDnsSidecarName), + Name: to.StringPtr(ComposeDNSSidecarName), ContainerProperties: &containerinstance.ContainerProperties{ Image: to.StringPtr("alpine:3.12.0"), Command: &alpineCmd,