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

Merge pull request #2870 from dotcloud/fix-links-parsing

Browse source 
fix -link parsing
This commit is contained in:
Victor Vieux 2013-11-26 00:09:09 -08:00
commit 06d5e25224
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
commands.go
View file

@ -1650,11 +1650,12 @@ func (opts AttachOpts) Set(val string) error {
// LinkOpts stores arguments to `docker run -link` // LinkOpts stores arguments to `docker run -link`
type LinkOpts []string type LinkOpts []string
func (link LinkOpts) String() string { return fmt.Sprintf("%v", []string(link)) } func (link *LinkOpts) String() string { return fmt.Sprintf("%v", []string(*link)) }
func (link LinkOpts) Set(val string) error { func (link *LinkOpts) Set(val string) error {
if _, err := parseLink(val); err != nil { if _, err := parseLink(val); err != nil {
return err return err
} }
*link = append(*link, val)
return nil return nil
} }
@ -1760,7 +1761,7 @@ func parseRun(cmd *flag.FlagSet, args []string, capabilities *Capabilities) (*Co
cmd.Var(flAttach, "a", "Attach to stdin, stdout or stderr.") cmd.Var(flAttach, "a", "Attach to stdin, stdout or stderr.")
cmd.Var(flVolumes, "v", "Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)") cmd.Var(flVolumes, "v", "Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)")
cmd.Var(flLinks, "link", "Add link to another container (name:alias)") cmd.Var(&flLinks, "link", "Add link to another container (name:alias)")
cmd.Var(&flPublish, "p", fmt.Sprintf("Publish a container's port to the host (format: %s) (use 'docker port' to see the actual mapping)", PortSpecTemplateFormat)) cmd.Var(&flPublish, "p", fmt.Sprintf("Publish a container's port to the host (format: %s) (use 'docker port' to see the actual mapping)", PortSpecTemplateFormat))
cmd.Var(&flExpose, "expose", "Expose a port from the container without publishing it to your host") cmd.Var(&flExpose, "expose", "Expose a port from the container without publishing it to your host")