1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

The etc and dot is seprated

Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
This commit is contained in:
YuPengZTE 2016-09-02 16:11:07 +08:00
parent fbcf0a50b2
commit bd914ff5a3
3 changed files with 5 additions and 5 deletions

View file

@ -50,7 +50,7 @@ IRC channel on the Freenode network.
| btrfs | |Enables dependencies for the "btrfs" graph driver, including necessary kernel flags.| | btrfs | |Enables dependencies for the "btrfs" graph driver, including necessary kernel flags.|
| contrib | Yes |Install additional contributed scripts and components.| | contrib | Yes |Install additional contributed scripts and components.|
| device-mapper | Yes |Enables dependencies for the "devicemapper" graph driver, including necessary kernel flags.| | device-mapper | Yes |Enables dependencies for the "devicemapper" graph driver, including necessary kernel flags.|
| doc | |Add extra documentation (API, Javadoc, etc). It is recommended to enable per package instead of globally.| | doc | |Add extra documentation, such as API and Javadoc. It is recommended to enable per package instead of globally.|
| vim-syntax | |Pulls in related vim syntax scripts.| | vim-syntax | |Pulls in related vim syntax scripts.|
| zsh-completion| |Enable zsh completion support.| | zsh-completion| |Enable zsh completion support.|

View file

@ -136,7 +136,7 @@ Finally, if you run Docker on a server, it is recommended to run
exclusively Docker in the server, and move all other services within exclusively Docker in the server, and move all other services within
containers controlled by Docker. Of course, it is fine to keep your containers controlled by Docker. Of course, it is fine to keep your
favorite admin tools (probably at least an SSH server), as well as favorite admin tools (probably at least an SSH server), as well as
existing monitoring/supervision processes (e.g., NRPE, collectd, etc). existing monitoring/supervision processes, such as NRPE and collectd.
## Linux kernel capabilities ## Linux kernel capabilities

View file

@ -238,12 +238,12 @@ keep the image size down. Since the `RUN` statement starts with
The `CMD` instruction should be used to run the software contained by your The `CMD` instruction should be used to run the software contained by your
image, along with any arguments. `CMD` should almost always be used in the image, along with any arguments. `CMD` should almost always be used in the
form of `CMD [“executable”, “param1”, “param2”…]`. Thus, if the image is for a form of `CMD [“executable”, “param1”, “param2”…]`. Thus, if the image is for a
service (Apache, Rails, etc.), you would run something like service, such as Apache and Rails, you would run something like
`CMD ["apache2","-DFOREGROUND"]`. Indeed, this form of the instruction is `CMD ["apache2","-DFOREGROUND"]`. Indeed, this form of the instruction is
recommended for any service-based image. recommended for any service-based image.
In most other cases, `CMD` should be given an interactive shell (bash, python, In most other cases, `CMD` should be given an interactive shell, such as bash, python
perl, etc), for example, `CMD ["perl", "-de0"]`, `CMD ["python"]`, or and perl. For example, `CMD ["perl", "-de0"]`, `CMD ["python"]`, or
`CMD [“php”, “-a”]`. Using this form means that when you execute something like `CMD [“php”, “-a”]`. Using this form means that when you execute something like
`docker run -it python`, youll get dropped into a usable shell, ready to go. `docker run -it python`, youll get dropped into a usable shell, ready to go.
`CMD` should rarely be used in the manner of `CMD [“param”, “param”]` in `CMD` should rarely be used in the manner of `CMD [“param”, “param”]` in