diff --git a/docs/sources/installation/binaries.rst b/docs/sources/installation/binaries.rst index 611429f84a..9b741d6918 100644 --- a/docs/sources/installation/binaries.rst +++ b/docs/sources/installation/binaries.rst @@ -57,6 +57,28 @@ Run the docker daemon # start the docker in daemon mode from the directory you unpacked sudo ./docker -d & + +.. _dockergroup: + +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 TCP port. By +default that Unix socket is owned by the user *root*, and so, by default, you +can access it with ``sudo``. + +Starting in version 0.5.3, if you (or your Docker installer) create a +Unix group called *docker* and add users to it, then the ``docker`` +daemon will make the ownership of the Unix socket read/writable by the +*docker* group when the daemon starts. The ``docker`` daemon must +always run as the root user, but if you run the ``docker`` client as a user in +the *docker* group then you don't need to add ``sudo`` to all the +client commands. + +.. warning:: The *docker* group is root-equivalent. + + Upgrades -------- diff --git a/docs/sources/installation/ubuntulinux.rst b/docs/sources/installation/ubuntulinux.rst index 17eee15e9a..9019f76c45 100644 --- a/docs/sources/installation/ubuntulinux.rst +++ b/docs/sources/installation/ubuntulinux.rst @@ -167,7 +167,43 @@ Type ``exit`` to exit **Done!**, now continue with the :ref:`hello_world` example. -Upgrades + +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 TCP port. By +default that Unix socket is owned by the user *root*, and so, by default, you +can access it with ``sudo``. + +Starting in version 0.5.3, if you (or your Docker installer) create a +Unix group called *docker* and add users to it, then the ``docker`` +daemon will make the ownership of the Unix socket read/writable by the +*docker* group when the daemon starts. The ``docker`` daemon must +always run as the root user, but if you run the ``docker`` client as a user in +the *docker* group then you don't need to add ``sudo`` to all the +client commands. + +.. warning:: The *docker* group is root-equivalent. + +**Example:** + +.. code-block:: bash + + # Add the docker group if it doesn't already exist. + sudo groupadd docker + + # Add the connected user "${USER}" to the docker group. + # Change the user name to match your preferred user. + # You may have to logout and log back in again for + # this to take effect. + sudo gpasswd -a ${USER} docker + + # Restart the docker daemon. + sudo service docker restart + + +Upgrade -------- To install the latest version of docker, use the standard ``apt-get`` method: diff --git a/docs/sources/use/basics.rst b/docs/sources/use/basics.rst index 6ad3851309..ed9dafe786 100644 --- a/docs/sources/use/basics.rst +++ b/docs/sources/use/basics.rst @@ -18,10 +18,10 @@ your docker install, run the following command: docker info If you get ``docker: command not found`` or something like -``/var/lib/docker/repositories: permission denied`` you have an incomplete -docker installation. Please refer to :ref:`installation_list` for installation -instructions. +``/var/lib/docker/repositories: permission denied`` you may have an incomplete +docker installation or insufficient privileges to access docker on your machine. +Please refer to :ref:`installation_list` for installation instructions. Download a pre-built image -------------------------- @@ -52,42 +52,6 @@ Running an interactive shell # use the escape sequence Ctrl-p + Ctrl-q sudo docker run -i -t ubuntu /bin/bash -.. _dockergroup: - -The sudo command and the docker Group -------------------------------------- - -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 TCP port. By -default that Unix socket is owned by the user *root*, and so, by default, you -can access it with ``sudo``. - -Starting in version 0.5.3, if you (or your Docker installer) create a -Unix group called *docker* and add users to it, then the ``docker`` -daemon will make the ownership of the Unix socket read/writable by the -*docker* group when the daemon starts. The ``docker`` daemon must -always run as the root user, but if you run the ``docker`` client as a user in -the *docker* group then you don't need to add ``sudo`` to all the -client commands. - -.. warning:: The *docker* group is root-equivalent. - -**Example:** - -.. code-block:: bash - - # Add the docker group if it doesn't already exist. - sudo groupadd docker - - # Add the connected user "${USER}" to the docker group. - # Change the user name to match your preferred user. - # You may have to logout and log back in again for - # this to take effect. - sudo gpasswd -a ${USER} docker - - # Restart the docker daemon. - sudo service docker restart - .. _bind_docker: Bind Docker to another host/port or a Unix socket