Prechádzať zdrojové kódy

Update with @moxiegirl's patch and add direct config

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Ankush Agarwal 10 rokov pred
rodič
commit
9689aab5ec
1 zmenil súbory, kde vykonal 61 pridanie a 23 odobranie
  1. 61 23
      docs/sources/articles/configuring.md

+ 61 - 23
docs/sources/articles/configuring.md

@@ -4,27 +4,46 @@ page_keywords: docker, daemon, configuration
 
 
 # Configuring Docker on various distributions
 # Configuring Docker on various distributions
 
 
-After successfully installing the Docker daemon on a distribution, it runs with it's default
-config. Usually it is required to change the default config to meet one's personal requirements.
- 
-Docker can be configured by passing the config flags to the daemon directly if the daemon
-is started directly. Usually that is not the case. A process manager (like SysVinit, Upstart,
-systemd, etc) is responsible for starting and running the daemon.
+After successfully installing Docker, the `docker` daemon runs with it's default
+configuration. You can configure the `docker` daemon by passing configuration
+flags to it directly when you start it.  
 
 
-Some common config options are
+In a production environment, system administrators typically configure the
+`docker` daemon to start and stop according to an organization's requirements.  In most
+cases, the system administrator configures a process manager such as `SysVinit`, `Upstart`,
+or `systemd` to manage the `docker` daemon's start and stop.
 
 
-* `-D` : Enable debug mode
+Some of the daemon's options are:
 
 
-* `-H` : Daemon socket(s) to connect to   
+| Flag                  | Description                                               |
+|-----------------------|-----------------------------------------------------------|
+| `-D`, `--debug=false` | Enable or disable debug mode.  By default, this is false. |
+| `-H`,`--host=[]`      | Daemon socket(s) to connect to.                           |
+| `--tls=false`         | Enable or disable TLS. By default, this is false.         |
 
 
-* `--tls` : Enable or disable TLS authentication
+The command line reference has the [complete list of daemon flags](/reference/commandline/cli/#daemon).
+
+## Direct Configuration
+
+If you're running the `docker` daemon directly by running `docker -d` instead of using a process manager,
+you can append the config options to the run command directly.
+
+
+Here is a an example of running the `docker` daemon with config options:
+
+    docker -d -D --tls=false -H tcp://0.0.0.0:2375
+
+These options : 
+
+- Enable `-D` (debug) mode 
+- Set `tls` to false
+- Listen for connections on `tcp://0.0.0.0:2375`
 
 
-The complete list of flags can found at [Docker Command Line Reference](/reference/commandline/cli/)
 
 
 ## Ubuntu
 ## Ubuntu
 
 
 After successfully [installing Docker for Ubuntu](/installation/ubuntulinux/), you can check the
 After successfully [installing Docker for Ubuntu](/installation/ubuntulinux/), you can check the
-running status using (if running Upstart)
+running status using Upstart in this way:
 
 
     $ sudo status docker
     $ sudo status docker
     docker start/running, process 989
     docker start/running, process 989
@@ -40,21 +59,40 @@ You can start/stop/restart `docker` using
 
 
 ### Configuring Docker
 ### Configuring Docker
 
 
-Docker options can be configured by editing the file `/etc/default/docker`. If this file does not 
-exist, it needs to be createdThis file contains a variable named `DOCKER_OPTS`. All the 
-config options need to be placed in this variable. For example
+You configure the `docker` daemon in the `/etc/default/docker` file on your
+system.  You do this by specifying values in a `DOCKER_OPTS` variable. 
+To configure Docker options:
+
+1. Log into your system as a user with `sudo` or `root` privileges.
+
+2. If you don't have one, create the `/etc/default/docker` file in your system. 
+
+	Depending on how you installed Docker, you may already have this file.
+
+3. Open the file with your favorite editor.
 
 
-    DOCKER_OPTS=" --dns 8.8.8.8 -D --tls=false -H tcp://0.0.0.0:2375 "
+		$ sudo vi /etc/default/docker
+		
+4. Add a `DOCKER_OPTS` variable with the following options. These options are appended to the
+`docker` daemon's run command.
 
 
-The above daemon options : 
+	``` 
+	 DOCKER_OPTS=" --dns 8.8.8.8 --dns 8.8.4.4 -D --tls=false -H tcp://0.0.0.0:2375 "
+	```
+	
+These options : 
 
 
-1. Set dns server for all containers
+- Set `dns` server for all containers
+- Enable `-D` (debug) mode 
+- Set `tls` to false
+- Listen for connections on `tcp://0.0.0.0:2375`
+  
+5. Save and close the file.
 
 
-2. Enable Debug mode 
+6. Restart the `docker` daemon.
 
 
-3. Set tls to false
+ 		 $ sudo restart docker
 
 
-4. Make the daemon listen for connections on `tcp://0.0.0.0:2375`
+7. Verify that the `docker` daemon is running as specified wit the `ps` command.
 
 
-After saving the file, restart docker using `sudo restart docker`. Verify that the daemon is
-running with the options specified by running `ps aux | grep docker | grep -v grep`
+		$ ps aux | grep docker | grep -v grep