Ver código fonte

graphdriver: windows: use strings.Cut()

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 2 anos atrás
pai
commit
6db4af7bd5
1 arquivos alterados com 8 adições e 7 exclusões
  1. 8 7
      daemon/graphdriver/windows/windows.go

+ 8 - 7
daemon/graphdriver/windows/windows.go

@@ -110,15 +110,16 @@ func InitFilter(home string, options []string, _ idtools.IdentityMapping) (graph
 		return nil, fmt.Errorf("windowsfilter failed to create '%s': %v", home, err)
 		return nil, fmt.Errorf("windowsfilter failed to create '%s': %v", home, err)
 	}
 	}
 
 
-	storageOpt := make(map[string]string)
-	storageOpt["size"] = defaultSandboxSize
+	storageOpt := map[string]string{
+		"size": defaultSandboxSize,
+	}
 
 
-	for _, v := range options {
-		opt := strings.SplitN(v, "=", 2)
-		storageOpt[strings.ToLower(opt[0])] = opt[1]
+	for _, o := range options {
+		k, v, _ := strings.Cut(o, "=")
+		storageOpt[strings.ToLower(k)] = v
 	}
 	}
 
 
-	storageOptions, err := parseStorageOpt(storageOpt)
+	opts, err := parseStorageOpt(storageOpt)
 	if err != nil {
 	if err != nil {
 		return nil, fmt.Errorf("windowsfilter failed to parse default storage options - %s", err)
 		return nil, fmt.Errorf("windowsfilter failed to parse default storage options - %s", err)
 	}
 	}
@@ -130,7 +131,7 @@ func InitFilter(home string, options []string, _ idtools.IdentityMapping) (graph
 		},
 		},
 		cache:              make(map[string]string),
 		cache:              make(map[string]string),
 		ctr:                graphdriver.NewRefCounter(&checker{}),
 		ctr:                graphdriver.NewRefCounter(&checker{}),
-		defaultStorageOpts: storageOptions,
+		defaultStorageOpts: opts,
 	}
 	}
 	return d, nil
 	return d, nil
 }
 }