1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Make a validation on links name

This commit is contained in:
Guillaume J. Charmes 2013-11-22 14:33:25 -08:00
parent d55998be81
commit 1c8ae47770
No known key found for this signature in database
GPG key ID: B33E4642CB6E3FF3

View file

@ -1656,6 +1656,18 @@ func (opts AttachOpts) Get(val string) bool {
return false return false
} }
type LinkOpts []string
func (link LinkOpts) String() string {
return fmt.Sprintf("%v", []string(link))
}
func (link LinkOpts) Set(val string) error {
if _, err := parseLink(val); err != nil {
return err
}
return nil
}
// PathOpts stores a unique set of absolute paths // PathOpts stores a unique set of absolute paths
type PathOpts map[string]struct{} type PathOpts map[string]struct{}
@ -1734,6 +1746,7 @@ func parseRun(cmd *flag.FlagSet, args []string, capabilities *Capabilities) (*Co
// FIXME: use utils.ListOpts for attach and volumes? // FIXME: use utils.ListOpts for attach and volumes?
flAttach = NewAttachOpts() flAttach = NewAttachOpts()
flVolumes = NewPathOpts() flVolumes = NewPathOpts()
flLinks = LinkOpts{}
flPublish utils.ListOpts flPublish utils.ListOpts
flExpose utils.ListOpts flExpose utils.ListOpts
@ -1741,7 +1754,6 @@ func parseRun(cmd *flag.FlagSet, args []string, capabilities *Capabilities) (*Co
flDns utils.ListOpts flDns utils.ListOpts
flVolumesFrom utils.ListOpts flVolumesFrom utils.ListOpts
flLxcOpts utils.ListOpts flLxcOpts utils.ListOpts
flLinks utils.ListOpts
flAutoRemove = cmd.Bool("rm", false, "Automatically remove the container when it exits (incompatible with -d)") flAutoRemove = cmd.Bool("rm", false, "Automatically remove the container when it exits (incompatible with -d)")
flDetach = cmd.Bool("d", false, "Detached mode: Run container in the background, print new container id") flDetach = cmd.Bool("d", false, "Detached mode: Run container in the background, print new container id")