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

Merge pull request #314 from docker/hide_sidecar 

Hide sidecar container from compose progress
This commit is contained in:
Djordje Lukic 2020-07-01 15:13:36 +02:00 committed by GitHub
parent 22b1de00ac 29f8c81afc
commit e1967921bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
azure/aci.go
View File

@ -33,6 +33,7 @@ import (
"github.com/morikuni/aec" "github.com/morikuni/aec"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/docker/api/azure/convert"
"github.com/docker/api/azure/login" "github.com/docker/api/azure/login"
"github.com/docker/api/context/store" "github.com/docker/api/context/store"
"github.com/docker/api/progress" "github.com/docker/api/progress"
@ -91,12 +92,14 @@ func createOrUpdateACIContainers(ctx context.Context, aciContext store.AciContex
StatusText: "Created", StatusText: "Created",
}) })
for _, c := range *groupDefinition.Containers { for _, c := range *groupDefinition.Containers {
if c.Name != nil && *c.Name != convert.ComposeDNSSidecarName {
w.Event(progress.Event{ w.Event(progress.Event{
ID: *c.Name, ID: *c.Name,
Status: progress.Working, Status: progress.Working,
StatusText: "Waiting", StatusText: "Waiting",
}) })
} }
}
err = future.WaitForCompletionRef(ctx, containerGroupsClient.Client) err = future.WaitForCompletionRef(ctx, containerGroupsClient.Client)
if err != nil { if err != nil {
@ -104,12 +107,14 @@ func createOrUpdateACIContainers(ctx context.Context, aciContext store.AciContex
} }
for _, c := range *groupDefinition.Containers { for _, c := range *groupDefinition.Containers {
if c.Name != nil && *c.Name != convert.ComposeDNSSidecarName {
w.Event(progress.Event{ w.Event(progress.Event{
ID: *c.Name, ID: *c.Name,
Status: progress.Done, Status: progress.Done,
StatusText: "Done", StatusText: "Done",
}) })
} }
}
return err return err
} }