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 #1573 from ulyssessouza/network-progress-fix 

Fix progress writer network creation and removal
This commit is contained in:
Nicolas De loof 2021-04-19 22:44:37 +02:00 committed by GitHub
parent 66f90098cd 0fbeedfb6e
commit d86649140f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
local/compose/create.go
View File

@ -930,7 +930,7 @@ func (s *composeService) ensureNetwork(ctx context.Context, n types.NetworkConfi
} }
createOpts.IPAM.Config = append(createOpts.IPAM.Config, config) createOpts.IPAM.Config = append(createOpts.IPAM.Config, config)
} }
networkEventName := fmt.Sprintf("Network %q", n.Name) networkEventName := fmt.Sprintf("Network %s", n.Name)
w := progress.ContextWriter(ctx) w := progress.ContextWriter(ctx)
w.Event(progress.CreatingEvent(networkEventName)) w.Event(progress.CreatingEvent(networkEventName))
if _, err := s.apiClient.NetworkCreate(ctx, n.Name, createOpts); err != nil { if _, err := s.apiClient.NetworkCreate(ctx, n.Name, createOpts); err != nil {
@ -947,7 +947,7 @@ func (s *composeService) ensureNetwork(ctx context.Context, n types.NetworkConfi
func (s *composeService) ensureNetworkDown(ctx context.Context, networkID string, networkName string) error { func (s *composeService) ensureNetworkDown(ctx context.Context, networkID string, networkName string) error {
w := progress.ContextWriter(ctx) w := progress.ContextWriter(ctx)
eventName := fmt.Sprintf("Network %q", networkName) eventName := fmt.Sprintf("Network %s", networkName)
w.Event(progress.RemovingEvent(eventName)) w.Event(progress.RemovingEvent(eventName))
if err := s.apiClient.NetworkRemove(ctx, networkID); err != nil { if err := s.apiClient.NetworkRemove(ctx, networkID); err != nil {