From 1c8ae47770b423b9c2f1125bd25cef0482a4600d Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Fri, 22 Nov 2013 14:33:25 -0800 Subject: [PATCH] Make a validation on links name --- commands.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/commands.go b/commands.go index 78f8154a36..75ad68fea2 100644 --- a/commands.go +++ b/commands.go @@ -1656,6 +1656,18 @@ func (opts AttachOpts) Get(val string) bool { 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 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? flAttach = NewAttachOpts() flVolumes = NewPathOpts() + flLinks = LinkOpts{} flPublish utils.ListOpts flExpose utils.ListOpts @@ -1741,7 +1754,6 @@ func parseRun(cmd *flag.FlagSet, args []string, capabilities *Capabilities) (*Co flDns utils.ListOpts flVolumesFrom utils.ListOpts flLxcOpts utils.ListOpts - flLinks utils.ListOpts 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")