docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-19 21:41:31 +03:00
Code Activity
16,187 Commits 12 Branches 297 Tags
967010d7ff4abec112e71c98ca6c8246ca6b3fea
Commit Graph

124 Commits

Author SHA1 Message Date
Marius Sturm
0c0594818f add UDP GELF logging-driver 
allows to send container logs to Graylog or Logstash.

Signed-off-by: Marius Sturm <marius@graylog.com>
Upstream-commit: 96d06e106fb9e35e5a526054d3aa0152152a9cc4
Component: engine
 2015-06-10 20:21:50 +02:00
Nicolas Borboën
7b52c53f62 Typo psuedo - pseudo 
Signed-off-by: ponsfrilus <ponsfrilus@gmail.com>
Upstream-commit: e12839fa5a1c1051a06d96a8b2f72c4e4625aa8d
Component: engine
 2015-06-10 13:27:55 +02:00
Doug Davis
21f31995a1 Minor doc edit to add clarity around the --volume path format 
Also add a comment to the ValidatePath func so devs/reviewers
know exactly what its looking for.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 3fcf53db920de9d9111a86bd0eda90a059885754
Component: engine
 2015-06-05 15:11:42 -07:00
Alexander Morozov
b508114358 Wrap lines for journald docs 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3df19749d420b1fae07cb4d7c5b61fbb53b15fa9
Component: engine
 2015-06-02 12:46:51 -07:00
Alexander Morozov
075ef85626 Change address to syslog-address in syslog docs 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 8979fe4d8a11d5f38e09e4acc6268c56d40ef151
Component: engine
 2015-06-02 12:44:23 -07:00
Alexander Morozov
f8248bbabf Add syslog-tag option for syslog log-driver 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a81af2e26a19cca0ffb8cbfa619169d55d604789
Component: engine
 2015-06-02 12:43:00 -07:00
Antonio Murdaca
8d306cf8a5 Add syslog-address log-opt 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: e8c88d253337776a6075c9db69140ce2c5014622
Component: engine
 2015-05-29 00:42:11 +02:00
Darren Shepherd
dc9bbf77b5 Add --uts=host to allow sharing the UTS namespace 
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: f2e5207fc989288ad136d48222df8e7754eb0e9b
Component: engine
 2015-05-13 17:56:32 -07:00
Jessie Frazelle
84543fc3ec Merge pull request #13074 from runcom/11824-short-link-if-equals-alias 
Allow links to be specified with only the name if it matches the alias
Upstream-commit: 8cc93856e37f045060cce5345e28421514ba7833
Component: engine
 2015-05-11 13:18:29 -07:00
Antonio Murdaca
60d5f903de Allow links to be specified with only the name if this matches the alias 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c6e6223ed735b4ff6a15f5d5716376d765f60b09
Component: engine
 2015-05-11 21:50:47 +02:00
Gianluca Borello
9784ed801a 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: e324f51e5b7bf9d28701af97bdb9fcdc26fc7699
Component: engine
 2015-05-10 08:11:26 -07:00
Ma Shimiao
560ba9b809 add cpu.cfs_period_us support 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: dccb8b5c339e218222bae4ce74bbeccb9e020c82
Component: engine
 2015-05-09 10:02:46 +08:00
wlan0
0a78638a6e Add log opts flag to pass in logging options 
Signed-off-by: wlan0 <sidharthamn@gmail.com>
Upstream-commit: dca9e02b15a3757272c90ec4cf0cc2b052a25fe3
Component: engine
 2015-05-04 14:39:48 -07:00
Jessie Frazelle
92cec4b2c1 Merge pull request #11516 from coolljt0725/add_show_error_set_some_flag_in_container_netmode 
add support --net=container with --mac-address, --add-host error out
Upstream-commit: 6b6a26c7697978bf7d43fec11d14ef6ee7e3e4d6
Component: engine
 2015-05-07 17:13:32 -07:00
Qiang Huang
4f3515319b 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: f133f11a7d25e6262558dd733afaa95ddd1c7aee
Component: engine
 2015-05-07 11:55:58 +08:00
Arnaud Porterie
f6876820fd Merge pull request #11844 from jbarbier/cgroup-parent-42 
Adding cgroup-parent option for docker build
Upstream-commit: e960e4bb129de15b3beb7da37421e32af8dccf2f
Component: engine
 2015-05-05 14:46:47 -07:00
Lei Jitang
49e7e90010 Add support --net=container with --mac-address,--add-host error out 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 0e08e9aca14a4ca7142fa4649983302d93b55dab
Component: engine
 2015-05-05 19:28:40 +08:00
Jessie Frazelle
366be0f240 Merge pull request #12865 from larsks/bug/12864 
journald log driver: use CONTAINER_ID field for container id
Upstream-commit: 0c1c2726876bdffad4e600456f07e256bc1361a1
Component: engine
 2015-05-04 10:53:58 -07:00
HuKeping
ad3d66108b Feature: option for disable OOM killer 
Add cgroup support for disable OOM killer.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: a4a924e1b6c50f0f02460489259d73468a6c282e
Component: engine
 2015-05-04 21:11:29 +08:00
Lars Kellogg-Stedman
72fc3b7751 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: 869ecba652294e069874c83591d6f1b469d7cc32
Component: engine
 2015-04-30 10:42:27 -04:00
Marianna
b3b4c052f9 Make the docs for --cgroup-parent better 
Signed-off-by: Marianna <mtesselh@gmail.com>
Upstream-commit: a8dfafc98642455ed83f9422f3174fa828dde4df
Component: engine
 2015-04-25 16:35:28 -04:00
Ed Costello
d7a0961327 Copy edits for typos 
Signed-off-by: Ed Costello <epc@epcostello.com>
Upstream-commit: fa9299f4c03cf097887db26dadcc63c711c925f1
Component: engine
 2015-04-25 15:01:05 -04:00
Rick Wieman
701a9fb9a1 Makes headings in documentation consistent 
Fixes #10673.

Signed-off-by: Rick Wieman <git@rickw.nl>
Upstream-commit: 63593267619378520a03e8984c5fcf0ec8957537
Component: engine
 2015-04-23 07:41:30 +02:00
Dan Walsh
b04ccc089c Add journald as a supported logger for containers 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 364287b74118de4f04d049426ef37fa9936d2065
Component: engine
 2015-04-21 12:57:54 -04:00
Lei Jitang
f8f4bcdb38 Add support cpu cfs quota 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: dcc50e1d593fd7995189872791c6d7a013f16970
Component: engine
 2015-04-20 08:16:47 -07:00
Qiang Huang
4f6ebaa34e add support for cpuset.mems 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 8077b2fb805c78cee642d8350df88227c6414960
Component: engine
 2015-04-15 09:33:46 +08:00
Bryan Boreham
426bfa8e61 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: 5ad15479a0f3ce804a44a6931b716b0fae22ac6d
Component: engine
 2015-04-13 17:39:38 +01:00
Yan Feng
c745cf0be5 Fix a typo in /doc/sources/reference/run.md 
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
Upstream-commit: 64fd944e30c8c045f6d998cc5ca950ea272541b5
Component: engine
 2015-04-08 11:23:47 -04:00
Yan Feng
cb57509d97 Fix 2 typos in /doc/sources/reference/run.md 
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
Upstream-commit: 805f34bb5b6f639b3eb361672af2cbc7437e2ce9
Component: engine
 2015-04-07 14:15:05 -04:00
Sebastiaan van Stijn
1394c160e0 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: f855d5dde70f1f3e4390e53576a3ca9b5a9db8ba
Component: engine
 2015-04-01 01:07:22 +02:00
Phil Estes
bc620e0b67 Merge pull request #11861 from ZJU-SEL/11752-add-cap-list-table 
Fix-11752 add capabilities list information table.
Upstream-commit: 97f621bcd84af39a92b5450a9450941651749944
Component: engine
 2015-03-30 23:18:30 -04:00
Harry Zhang
b39200ad98 Revison the some columns to make table clearer 
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
Upstream-commit: bf15f675b9042db661de720900f367eff19737c0
Component: engine
 2015-03-31 02:41:49 +00:00
Ankush Agarwal
5ba38993bc Explain --net=host option usage 
Fixes #11630

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: ddd27616e0abe44c7589b15de3fdbf5bb043ea6a
Component: engine
 2015-03-30 10:28:44 -07:00
Harry Zhang
3f29284d18 Remove dupllicated prefix to make table shorter & fix bugs 
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
Upstream-commit: 194cad243ccf622c8ff048975e26cc6c51ccbf30
Component: engine
 2015-03-28 01:49:28 +00:00
cheney90
61457ac29a Add capabilities list information table. 
Signed-off-by: Chen Qiu <21321229@zju.edu.cn>
Upstream-commit: 89a29d7e99e57bcbcf87a7657070bfdf59d7b6ad
Component: engine
 2015-03-27 08:45:36 +00:00
Mary Anthony
d294d535e9 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: a4609a1dfbcfb2fea10aa2be15124e0809528d04
Component: engine
 2015-03-26 10:13:19 -07:00
moxiegirl
dc0bb844c3 Merge pull request #11694 from hqhq/hq_add_memsw_example 
docs: add memory and swap memory usage examples
Upstream-commit: 67eb10defe0617c3dbb563002474e8e85b97b7bb
Component: engine
 2015-03-25 07:01:44 -07:00
Qiang Huang
c7b0d94a4d add cpuset and examples to run.md 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: a5cbb5c3aec0d5c717581b2b60b9ae89b2c6fd05
Component: engine
 2015-03-24 18:48:08 +08:00
Qiang Huang
5ae0277137 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: 0f9c20fe688e0bc093f631b7d31badc4bb750bd7
Component: engine
 2015-03-24 13:45:16 +08:00
Alexander Morozov
dad3640059 Merge pull request #11458 from ibuildthecloud/syslog 
Add syslog logging driver
Upstream-commit: 65e21f570358f46f6ad0f8fa2cd3394706ba169d
Component: engine
 2015-03-23 11:34:33 -07:00
sidharthamani
a7d21898b0 add syslog driver 
Signed-off-by: wlan0 <sid@rancher.com>
Upstream-commit: eaecd8b1b5871a4d17be27e3615106587eec1d3a
Component: engine
 2015-03-21 18:01:18 -07:00
Lloyd Dewolf
b2e6c9b566 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: 6ca1494f1932b66e042263999d8afd90e184ebf8
Component: engine
 2015-03-19 13:59:40 -07:00
Arnaud Porterie
90fc12f567 Merge pull request #10568 from LK4D4/logging_drivers 
Logging drivers
Upstream-commit: 1ff5a91007f01d2d61a7b2066db2e164085f0d1b
Component: engine
 2015-03-17 09:45:58 -07:00
Andy Goldstein
d6d379e87a 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: a2b0c9778feac970524b98ef7a91b5528fdeb9d5
Component: engine
 2015-03-17 10:10:42 +00:00
Jessie Frazelle
9d08a2eb1e Merge pull request #11239 from thaJeztah/docs-tables-in-run-reference 
docs: use more tables in run reference and minor fixups
Upstream-commit: da24ba42e2717bb5d8765c8ba42cd4aeaa7a8ec6
Component: engine
 2015-03-16 18:02:42 -07:00
Alexander Morozov
1174b9d420 Merge pull request #10238 from miminar/ephemeral-port-range-allocation 
Use system's ephemeral port range for port allocation
Upstream-commit: 02c1dd899a7ea84c89cb6f5a87297f4690e393ef
Component: engine
 2015-03-13 15:18:05 -07:00
Alexander Morozov
9010aeaadf Fail docker logs on all logging drivers apart from 'json-file' 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: bdf3a0295d401624483d4103fdaacc2bea1c7d46
Component: engine
 2015-03-13 15:02:09 -07:00
Alexander Morozov
0f5871ff56 Default 'json-file' logging driver and none logging driver 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 47a6afb93f7f71c7ef7dc692c0f50ac81b5a8c98
Component: engine
 2015-03-13 12:13:21 -07:00
Sebastiaan van Stijn
5396020453 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: 37d856db14280a35bcc4b53009db5a286f1ef9b6
Component: engine
 2015-03-11 23:41:57 +01:00
Phil Estes
cb89c142a6 Merge pull request #11244 from ChristopherBiscardi/docs-code-fixes 
Fix a few code rendering errors in docs
Upstream-commit: 95dcb2748442fc1f59e8c2e010679e0aea3cef1c
Component: engine
 2015-03-11 08:34:53 -04:00