From 400d92871cb300ee8696dbcedcfd6a95f4d9d5a7 Mon Sep 17 00:00:00 2001 From: Lei Jitang Date: Tue, 13 Jan 2015 09:38:12 +0800 Subject: [PATCH] Add --link accept container ID Signed-off-by: Lei Jitang --- daemon/daemon.go | 5 +---- runconfig/parse.go | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/daemon/daemon.go b/daemon/daemon.go index 5972b4f87d..68850ad878 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -752,10 +752,7 @@ func (daemon *Daemon) RegisterLinks(container *Container, hostConfig *runconfig. if err != nil { return err } - child, err := daemon.GetByName(parts["name"]) - if err != nil { - return err - } + child := daemon.Get(parts["name"]) if child == nil { return fmt.Errorf("Could not get container for %s", parts["name"]) } diff --git a/runconfig/parse.go b/runconfig/parse.go index 3bab8ac765..e6807890ac 100644 --- a/runconfig/parse.go +++ b/runconfig/parse.go @@ -66,7 +66,7 @@ func Parse(cmd *flag.FlagSet, args []string) (*Config, *HostConfig, *flag.FlagSe cmd.Var(&flAttach, []string{"a", "-attach"}, "Attach to STDIN, STDOUT or STDERR.") cmd.Var(&flVolumes, []string{"v", "-volume"}, "Bind mount a volume (e.g., from the host: -v /host:/container, from Docker: -v /container)") - cmd.Var(&flLinks, []string{"#link", "-link"}, "Add link to another container in the form of name:alias") + cmd.Var(&flLinks, []string{"#link", "-link"}, "Add link to another container in the form of :alias") cmd.Var(&flDevices, []string{"-device"}, "Add a host device to the container (e.g. --device=/dev/sdc:/dev/xvdc:rwm)") cmd.Var(&flEnv, []string{"e", "-env"}, "Set environment variables")