Commit Graph

103 Commits

Author SHA1 Message Date
250204b7d0 Wrap lines for journald docs
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: cf8790f920
Component: cli
2017-06-02 00:06:57 +00:00
4e4f09e126 Change address to syslog-address in syslog docs
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: f9f6d8a353
Component: cli
2017-06-02 00:06:57 +00:00
6ca4003cae Add syslog-tag option for syslog log-driver
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 0558f93aa9
Component: cli
2017-06-02 00:06:57 +00:00
72c09c48d3 Add syslog-address log-opt
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: ba522b3391
Component: cli
2017-06-02 00:06:56 +00:00
edfeb650e8 Add --uts=host to allow sharing the UTS namespace
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 02c900f4c5
Component: cli
2017-06-02 00:06:56 +00:00
e8a925c579 Allow links to be specified with only the name if this matches the alias
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 313659dd18
Component: cli
2017-06-02 00:06:56 +00:00
1ad8193325 Default MAC address generation is not random and should be stated in the documentation.
Signed-off-by: Gianluca Borello <g.borello@gmail.com>
Upstream-commit: ed206bfca4
Component: cli
2017-06-02 00:06:55 +00:00
37cbf376eb add cpu.cfs_period_us support
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: edbbcc6dae
Component: cli
2017-06-02 00:06:55 +00:00
bbbac1c21c Add log opts flag to pass in logging options
Signed-off-by: wlan0 <sidharthamn@gmail.com>
Upstream-commit: 9949905359
Component: cli
2017-06-02 00:06:55 +00:00
8834d9e361 Add support --net=container with --mac-address,--add-host error out
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 68f8a90e3d
Component: cli
2017-06-02 00:06:55 +00:00
db297e1322 add blkio.weight support
We can use this to control block IO weight of a container.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 19815c878d
Component: cli
2017-06-02 00:06:55 +00:00
51de3c55fb Make the docs for --cgroup-parent better
Signed-off-by: Marianna <mtesselh@gmail.com>
Upstream-commit: 2cf6bfdc61
Component: cli
2017-06-02 00:06:55 +00:00
d6953e86b7 journald log driver: use CONTAINER_ID field for container id
This patch modifies the journald log driver to store the container ID in
a field named CONTAINER_ID, rather than (ab)using the MESSAGE_ID field.
Additionally, this adds the CONTAINER_ID_FULL field containing the
complete container ID and CONTAINER_NAME, containing the container name.

When using the journald log driver, this permits you to see log messages
from a particular container like this:

    # journalctl CONTAINER_ID=a9238443e193

Example output from "journalctl -o verbose" includes the following:

    CONTAINER_ID=27aae7361e67
    CONTAINER_ID_FULL=27aae7361e67e2b4d3864280acd2b80e78daf8ec73786d8b68f3afeeaabbd4c4
    CONTAINER_NAME=web

Closes: #12864
Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
Upstream-commit: c6bcaacce7
Component: cli
2017-06-02 00:06:55 +00:00
0180f3810e Feature: option for disable OOM killer
Add cgroup support for disable OOM killer.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 16d979a292
Component: cli
2017-06-02 00:06:55 +00:00
4da3316cfb Copy edits for typos
Signed-off-by: Ed Costello <epc@epcostello.com>
Upstream-commit: fcf01194a9
Component: cli
2017-06-02 00:06:55 +00:00
94d260e45d Makes headings in documentation consistent
Fixes #10673.

Signed-off-by: Rick Wieman <git@rickw.nl>
Upstream-commit: acc0eac695
Component: cli
2017-06-02 00:06:54 +00:00
1d8626a153 Add journald as a supported logger for containers
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 33e6a5b9c5
Component: cli
2017-06-02 00:06:54 +00:00
e28ed017e0 Add support cpu cfs quota
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 6c60a3415c
Component: cli
2017-06-02 00:06:54 +00:00
d9394807a2 add support for cpuset.mems
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 84861b2109
Component: cli
2017-06-02 00:06:54 +00:00
a384008538 Add a note about PID 1 not terminating on SIGINT/SIGTERM.
Also re-arranged the description of CTRL-c to make it clearer.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Upstream-commit: 07ee4d5ec2
Component: cli
2017-06-02 00:06:54 +00:00
5ed6667bf3 Fix a typo in /doc/sources/reference/run.md
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
Upstream-commit: cd83db8e07
Component: cli
2017-06-02 00:06:53 +00:00
5a729dc4e8 Fix 2 typos in /doc/sources/reference/run.md
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
Upstream-commit: 4836b6041a
Component: cli
2017-06-02 00:06:53 +00:00
2568ea2e48 Fix heading level of logging drivers
Syslog was a heading-2, but should be heading-3;
changed the headings to heading-4 to match the
"network settings" section.

Also changed "Log driver" to "logging driver" for JSON.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 07995c4ef3
Component: cli
2017-06-02 00:06:52 +00:00
b86e6831ba Revison the some columns to make table clearer
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
Upstream-commit: 5ed0d9c3de
Component: cli
2017-06-02 00:06:52 +00:00
4d0c23a8b2 Remove dupllicated prefix to make table shorter & fix bugs
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
Upstream-commit: 5b000494ee
Component: cli
2017-06-02 00:06:52 +00:00
cf5a6d43f7 Add capabilities list information table.
Signed-off-by: Chen Qiu <21321229@zju.edu.cn>
Upstream-commit: 0864264159
Component: cli
2017-06-02 00:06:52 +00:00
4bfc1c3bca Explain --net=host option usage
Fixes #11630

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 7ac28ecb2c
Component: cli
2017-06-02 00:06:52 +00:00
f979089af6 Removing sudo from examples
We now have instructions in our Unix installs about setting up
docker group to avoid sudo.  Also, Mac/Windows shouldn't use
sudo.  So, I've removed sudo from our examples and added a
section at the top reminding them that if they have to use
sudo to run docker they can change that.

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: c4323175d9
Component: cli
2017-06-02 00:06:52 +00:00
56ba763d48 add cpuset and examples to run.md
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 7618ff84f8
Component: cli
2017-06-02 00:06:51 +00:00
e97ca146b6 docs: add memory and swap memory usage examples
fix: https://github.com/docker/docker/issues/11629

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 645b49d05b
Component: cli
2017-06-02 00:06:51 +00:00
8ece884edf add syslog driver
Signed-off-by: wlan0 <sid@rancher.com>
Upstream-commit: 72bb856565
Component: cli
2017-06-02 00:06:51 +00:00
ed9cbed2b2 doc: reference/run introduce -it .
Also:
- Fix "docker" cmd always "sudo docker" for docs.
- Fix "-ti" with "-it".
- fix "/docker" typo.

Signed-off-by: Lloyd Dewolf <foolswisdom@gmail.com>
Upstream-commit: f672cb24cb
Component: cli
2017-06-02 00:06:51 +00:00
37e848aecb Fail docker logs on all logging drivers apart from 'json-file'
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: e30532cf3f
Component: cli
2017-06-02 00:06:50 +00:00
2fb4844dac Default 'json-file' logging driver and none logging driver
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 1459501312
Component: cli
2017-06-02 00:06:50 +00:00
409acea418 Add ability to refer to image by name + digest
Add ability to refer to an image by repository name and digest using the
format repository@digest. Works for pull, push, run, build, and rmi.

Signed-off-by: Andy Goldstein <agoldste@redhat.com>
Upstream-commit: 2eaa831df5
Component: cli
2017-06-02 00:06:50 +00:00
d2823eba52 docs: use more tables in run reference and minor fixups
This adds two more tables to the run reference documentation.

- the list of 'modes' for Network settings is now a table.
- the "note" for `--net="host"` was moved from the list to the detailed
  description.
- the 'options' for "Runtime constraints on CPU and memory" are
  now a table
- slightly re-worded the description for "memory" options, e.g.
  "It is not allowed..." was rewriten to "The *container* is not allowed..."
- fix example in "Runtime privilege, Linux capabilities, and LXC configuration"
  being indented twice
- slightly reduced indenting in some `usage` output to be better readable.
- fixes a typo `/ets/hosts` -> `/etc/hosts`

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3359add082
Component: cli
2017-06-02 00:06:50 +00:00
edf755a3af Use system's ephemeral port range for port allocation
Read `/proc/sys/net/ipv4/ip_local_port_range` kernel parameter to obtain
ephemeral port range that now sets the boundaries of port allocator
which finds free host ports for those exported by containers.

Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: 6098d0f443
Component: cli
2017-06-02 00:06:49 +00:00
4304688cd7 Fix a few code rendering errors in docs
Signed-off-by: ChristoperBiscardi <chris@docker.com>
Upstream-commit: 50caf393cb
Component: cli
2017-06-02 00:06:49 +00:00
0f5cfa4975 fix to cpu.shares documentation by @hqhq
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 5f274ccd57
Component: cli
2017-06-02 00:06:48 +00:00
512a13d62b docs: fix cpu.shares part in man pages
The original description has some mistakes and lack of many useful
information, I rewrite them to make it accurate and complete.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: ef5874f0a9
Component: cli
2017-06-02 00:06:48 +00:00
54ef332e9a Docs: add restart-policies to 'Run reference'
This moves some information on restart-policies from
the "command line" page to "run reference".

Also fixes some minor typos and adds a "NOTE"
about --rm and --restart not allowed to be combined.

Also removes inline CSS styles from tables,
which will be styled by the stylesheet, and fixes
some minor MarkDown errors (`<` -> &lt;)

depends on https://github.com/docker/docs-base/pull/1

resolves #11069

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 99a47ff600
Component: cli
2017-06-02 00:06:48 +00:00
d22e4aebf1 update docs for memory and memoryswap
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: c03b0700a4
Component: cli
2017-06-02 00:06:46 +00:00
f0ff9d086e Pretty the help text
This modifies the "docker help" text so that it is no wider than 80 chars
and each description fits on one line. This will also try to use ~ when
possible

Added a test to make sure we don't go over 80 chars again.
Added a test to make sure we use ~

Applied rules/tests to all docker commands - not just main help text

Closes #10214

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 130c0bf094
Component: cli
2017-06-02 00:06:46 +00:00
5dccac542c Update the docs for --link accept container id
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: ca57d01f87
Component: cli
2017-06-02 00:06:45 +00:00
5e88125007 Document that ENV vars are not automatically updated
Unlike the entries in `/etc/hosts`, environment-variables for linked
containers are not automatically updated if the linked container is
restarted.

This adds a note to the documentation in;
https://docs.docker.com/userguide/dockerlinks/#environment-variables
and
https://docs.docker.com/reference/run/#env-environment-variables

To make users aware that this is the case and recommends them to use
the `/etc/hosts` entries in stead.

I added this change because users were expecting environment variables
to be updated automatically as well (https://github.com/docker/docker/issues/10164).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7c63b49df6
Component: cli
2017-06-02 00:06:45 +00:00
1e0e65f98b Allow the container to share the PID namespace with the host
We want to be able to use container without the PID namespace.  We basically
want containers that can manage the host os, which I call Super Privileged
Containers.  We eventually would like to get to the point where the only
namespace we use is the MNT namespace to bring the Apps userspace with it.

By eliminating the PID namespace we can get better communication between the
host and the clients and potentially tools like strace and gdb become easier
to use.  We also see tools like libvirtd running within a container telling
systemd to place a VM in a particular cgroup, we need to have communications of the PID.

I don't see us needing to share PID namespaces between containers, since this
is really what docker exec does.

So currently I see us just needing docker run --pid=host

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: f4573ee0bc
Component: cli
2017-06-02 00:06:44 +00:00
5119c5b376 Fixed minor typo
Signed-off-by: Christian Stefanescu <st.chris@gmail.com>
Upstream-commit: c5bd80c738
Component: cli
2017-06-02 00:06:44 +00:00
b19512b38c add ability to publish range of ports
Closes #8899
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: c33d198609
Component: cli
2017-06-02 00:06:44 +00:00
b39e021d90 add Scott's link checker script, and fix what it finds
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 1cc7a4eb81
Component: cli
2017-06-02 00:06:43 +00:00
d686976ec8 Added description for 'docker run' command, -c/--cpu-shares flag
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 41d3d7dc72
Component: cli
2017-06-02 00:06:43 +00:00