Skip to content
This repository has been archived by the owner on Jun 20, 2024. It is now read-only.

Don't remove weave network on plugin shutdown because it bricks Docker 1.10 #1963

Merged
merged 1 commit into from
Feb 9, 2016
Merged

Don't remove weave network on plugin shutdown because it bricks Docker 1.10 #1963

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions prog/plugin/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,6 @@ func run(dockerClient *docker.Client, address, meshAddress, meshNetworkName, nam
select {
case sig := <-sigChan:
Log.Debugf("Caught signal %s; shutting down", sig)
if meshNetworkName != "" {
return dockerClient.Client.RemoveNetwork(meshNetworkName)
}
return nil
case err := <-endChan:
return err
Expand Down