This commit is contained in:
cuigh 2019-04-30 14:07:11 +08:00
parent 9f028a3ce4
commit 9028e8ad44
2 changed files with 3 additions and 4 deletions

View File

@ -253,8 +253,7 @@ func createNetworks(ctx context.Context, cli *client.Client, namespace compose.N
existingNetworkMap[network.Name] = network existingNetworkMap[network.Name] = network
} }
for internalName, createOpts := range networks { for name, createOpts := range networks {
name := namespace.Scope(internalName)
if _, exists := existingNetworkMap[name]; exists { if _, exists := existingNetworkMap[name]; exists {
continue continue
} }
@ -265,7 +264,7 @@ func createNetworks(ctx context.Context, cli *client.Client, namespace compose.N
mgr.Logger().Infof("Creating network %s", name) mgr.Logger().Infof("Creating network %s", name)
if _, err = cli.NetworkCreate(ctx, name, createOpts); err != nil { if _, err = cli.NetworkCreate(ctx, name, createOpts); err != nil {
return errors.Wrap(err, "failed to create network "+internalName) return errors.Wrap(err, "failed to create network "+name)
} }
} }
return nil return nil

View File

@ -27,7 +27,7 @@ func main() {
misc.BindOptions() misc.BindOptions()
app.Name = "Swirl" app.Name = "Swirl"
app.Version = "0.8.4" app.Version = "0.8.5"
app.Desc = "A web management UI for Docker, focused on swarm cluster" app.Desc = "A web management UI for Docker, focused on swarm cluster"
app.Action = func(ctx *app.Context) error { app.Action = func(ctx *app.Context) error {
err := config.UnmarshalOption("swirl", &misc.Options) err := config.UnmarshalOption("swirl", &misc.Options)