From bc62a35ffb2eeacb3ae79bc65076a01744d78a5d Mon Sep 17 00:00:00 2001 From: Scott Walls Date: Sun, 26 Oct 2014 12:42:51 -0700 Subject: [PATCH] ubuntulinux.md - old commands, typo, section movement - Removed some commands related to autocomplete/symlinks that don't seem to be required anymore on Ubuntu 14.04 - Fixed one minor typo ("see LINK _for_ details," not "see LINK details") - Moved section "Giving non-root access" to top level, rather than being under Ubuntu 13 (the section isn't specific to Ubuntu 13, and even references Ubuntu 14). Signed-off-by: Scott Walls --- docs/sources/installation/ubuntulinux.md | 31 ++++++++++++------------ 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/docs/sources/installation/ubuntulinux.md b/docs/sources/installation/ubuntulinux.md index efeeeea2e1..09b776f08d 100644 --- a/docs/sources/installation/ubuntulinux.md +++ b/docs/sources/installation/ubuntulinux.md @@ -29,8 +29,9 @@ To install the latest Ubuntu package (may not be the latest Docker release): $ sudo apt-get update $ sudo apt-get install docker.io - $ sudo ln -sf /usr/bin/docker.io /usr/local/bin/docker - $ sudo sed -i '$acomplete -F _docker docker' /etc/bash_completion.d/docker.io + +Then, to enable tab-completion of Docker commands in BASH, either restart BASH or: + $ source /etc/bash_completion.d/docker.io If you'd like to try the latest version of Docker: @@ -202,7 +203,18 @@ Type `exit` to exit **Done!**, now continue with the [User Guide](/userguide/). -### Giving non-root access +### Upgrade + +To install the latest version of Docker, use the standard +`apt-get` method: + + # update your sources list + $ sudo apt-get update + + # install the latest + $ sudo apt-get install lxc-docker + +## Giving non-root access The `docker` daemon always runs as the `root` user, and since Docker version 0.5.2, the `docker` daemon binds to a Unix socket instead of a @@ -221,7 +233,7 @@ alternative group. > **Warning**: > The `docker` group (or the group specified with the `-G` flag) is > `root`-equivalent; see [*Docker Daemon Attack Surface*]( -> /articles/security/#dockersecurity-daemon) details. +> /articles/security/#dockersecurity-daemon) for details. **Example:** @@ -238,17 +250,6 @@ alternative group. # If you are in Ubuntu 14.04, use docker.io instead of docker $ sudo service docker restart -### Upgrade - -To install the latest version of docker, use the standard -`apt-get` method: - - # update your sources list - $ sudo apt-get update - - # install the latest - $ sudo apt-get install lxc-docker - ## Memory and Swap Accounting If you want to enable memory and swap accounting, you must add the