diff --git a/commands.go b/commands.go index 9a8ae57310..f62fdeef20 100644 --- a/commands.go +++ b/commands.go @@ -92,7 +92,6 @@ func (cli *DockerCli) CmdHelp(args ...string) error { {"kill", "Kill a running container"}, {"login", "Register or Login to the docker registry server"}, {"logs", "Fetch the logs of a container"}, - {"ls", "List links for containers"}, {"port", "Lookup the public-facing port which is NAT-ed to PRIVATE_PORT"}, {"ps", "List containers"}, {"pull", "Pull an image or a repository from the docker registry server"}, diff --git a/docs/sources/examples/linking_into_redis.rst b/docs/sources/examples/linking_into_redis.rst index 6c9b7a4ffc..1712e62d69 100644 --- a/docs/sources/examples/linking_into_redis.rst +++ b/docs/sources/examples/linking_into_redis.rst @@ -58,20 +58,12 @@ Run the redis container This will run our redis container using the default port of 6379 and using as password to secure our service. Next we will link the redis container to -a new name using ``docker link`` and ``docker ls``. +a new name using ``docker link``. Linking an existing container ----------------------------- -.. code-block:: bash - - docker ls - - NAME ID IMAGE - /39588b6a45100ef5b328b2c302ea085624f29e6cbab70f88be04793af02cec89 39588b6a45100ef5b328b2c302ea085624f29e6cbab70f88be04793af02cec89 crosbymichael/redis:latest - - Docker will automatically create an initial link with the container's id but because the is long and not very user friendly we can link the container with a new name. @@ -80,12 +72,6 @@ a new name. docker link /39588b6a45100ef5b328b2c302ea085624f29e6cbab70f88be04793af02cec89 /redis - docker ls - - NAME ID IMAGE - /redis 39588b6a45100ef5b328b2c302ea085624f29e6cbab70f88be04793af02cec89 crosbymichael/redis:latest - /39588b6a45100ef5b328b2c302ea085624f29e6cbab70f88be04793af02cec89 39588b6a45100ef5b328b2c302ea085624f29e6cbab70f88be04793af02cec89 crosbymichael/redis:latest - Now we can reference our running redis service using the friendly name ``/redis``. We can issue all the commands that you would expect; start, stop, attach, using the new name.