Switch back config to map[string]struct{}

Upstream-commit: faf8daa7c68f2511dedfad15e1fd05f9eff077a2
Component: engine

components/engine/commands.go

@@ -915,21 +915,21 @@ func (opts AttachOpts) Get(val string) bool {
 }
 
 // PathOpts stores a unique set of absolute paths
-type PathOpts map[string]string
+type PathOpts map[string]struct{}
 
 func NewPathOpts() PathOpts {
 	return make(PathOpts)
 }
 
 func (opts PathOpts) String() string {
-	return fmt.Sprintf("%v", map[string]string(opts))
+	return fmt.Sprintf("%v", map[string]struct{}(opts))
 }
 
 func (opts PathOpts) Set(val string) error {
 	if !filepath.IsAbs(val) {
 		return fmt.Errorf("%s is not an absolute path", val)
 	}
-	opts[filepath.Clean(val)] = ""
+	opts[filepath.Clean(val)] = struct{}{}
 	return nil
 }
 

components/engine/container.go

@@ -66,7 +66,7 @@ type Config struct {
 	Cmd          []string
 	Dns          []string
 	Image        string // Name of the image as it was passed by the operator (eg. could be symbolic)
-	Volumes      map[string]string
+	Volumes      map[string]struct{}
 }
 
 func ParseRun(args []string, stdout io.Writer, capabilities *Capabilities) (*Config, error) {