0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
16208 commits 14 branches 412 tags 338 MiB
Commit graph

127 commits

Author SHA1 Message Date
Mary Anthony
f93fee5f48 retooling for hugo 
Tweaking for Hugo
Updating the Dockerfile with new sed; fix broken link on Kitematic
Fixing image pull for Dockerfile
Removing docs targets

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-15 13:19:38 -07:00
Sebastiaan van Stijn
637023a5f8 Merge pull request #13502 from coolljt0725/conflict_port_and_netmode 
Add --net=container with --publish --expose --publish-all error out
 2015-06-15 16:25:59 +02:00
Marius Sturm
96d06e106f add UDP GELF logging-driver 
allows to send container logs to Graylog or Logstash.

Signed-off-by: Marius Sturm <marius@graylog.com>
 2015-06-10 20:21:50 +02:00
Nicolas Borboën
e12839fa5a Typo psuedo - pseudo 
Signed-off-by: ponsfrilus <ponsfrilus@gmail.com>
 2015-06-10 13:27:55 +02:00
Doug Davis
3fcf53db92 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>
 2015-06-05 15:11:42 -07:00
Alexander Morozov
3df19749d4 Wrap lines for journald docs 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-06-02 12:46:51 -07:00
Alexander Morozov
8979fe4d8a Change address to syslog-address in syslog docs 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-06-02 12:44:23 -07:00
Alexander Morozov
a81af2e26a Add syslog-tag option for syslog log-driver 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-06-02 12:43:00 -07:00
Antonio Murdaca
e8c88d2533 Add syslog-address log-opt 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-29 00:42:11 +02:00
Lei Jitang
13f2aa7068 Add --net=container with --publish --publish-all --expose error out 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-27 15:31:06 +08:00
Darren Shepherd
f2e5207fc9 Add --uts=host to allow sharing the UTS namespace 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-05-13 17:56:32 -07:00
Jessie Frazelle
8cc93856e3 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
 2015-05-11 13:18:29 -07:00
Antonio Murdaca
c6e6223ed7 Allow links to be specified with only the name if this matches the alias 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-11 21:50:47 +02:00
Gianluca Borello
e324f51e5b Default MAC address generation is not random and should be stated in the documentation. 
Signed-off-by: Gianluca Borello <g.borello@gmail.com>
 2015-05-10 08:11:26 -07:00
Ma Shimiao
dccb8b5c33 add cpu.cfs_period_us support 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-05-09 10:02:46 +08:00
wlan0
dca9e02b15 Add log opts flag to pass in logging options 
Signed-off-by: wlan0 <sidharthamn@gmail.com>
 2015-05-04 14:39:48 -07:00
Jessie Frazelle
6b6a26c769 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
 2015-05-07 17:13:32 -07:00
Qiang Huang
f133f11a7d 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>
 2015-05-07 11:55:58 +08:00
Arnaud Porterie
e960e4bb12 Merge pull request #11844 from jbarbier/cgroup-parent-42 
Adding cgroup-parent option for docker build
 2015-05-05 14:46:47 -07:00
Lei Jitang
0e08e9aca1 Add support --net=container with --mac-address,--add-host error out 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-05 19:28:40 +08:00
Jessie Frazelle
0c1c272687 Merge pull request #12865 from larsks/bug/12864 
journald log driver: use CONTAINER_ID field for container id
 2015-05-04 10:53:58 -07:00
HuKeping
a4a924e1b6 Feature: option for disable OOM killer 
Add cgroup support for disable OOM killer.

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-05-04 21:11:29 +08:00
Lars Kellogg-Stedman
869ecba652 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>
 2015-04-30 10:42:27 -04:00
Marianna
a8dfafc986 Make the docs for --cgroup-parent better 
Signed-off-by: Marianna <mtesselh@gmail.com>
 2015-04-25 16:35:28 -04:00
Ed Costello
fa9299f4c0 Copy edits for typos 
Signed-off-by: Ed Costello <epc@epcostello.com>
 2015-04-25 15:01:05 -04:00
Rick Wieman
6359326761 Makes headings in documentation consistent 
Fixes #10673.

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

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-03-30 10:28:44 -07:00
Harry Zhang
194cad243c Remove dupllicated prefix to make table shorter & fix bugs 
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
 2015-03-28 01:49:28 +00:00
cheney90
89a29d7e99 Add capabilities list information table. 
Signed-off-by: Chen Qiu <21321229@zju.edu.cn>
 2015-03-27 08:45:36 +00:00
Mary Anthony
a4609a1dfb 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>
 2015-03-26 10:13:19 -07:00
moxiegirl
67eb10defe Merge pull request #11694 from hqhq/hq_add_memsw_example 
docs: add memory and swap memory usage examples
 2015-03-25 07:01:44 -07:00
Qiang Huang
a5cbb5c3ae add cpuset and examples to run.md 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-03-24 18:48:08 +08:00
Qiang Huang
0f9c20fe68 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>
 2015-03-24 13:45:16 +08:00
Alexander Morozov
65e21f5703 Merge pull request #11458 from ibuildthecloud/syslog 
Add syslog logging driver
 2015-03-23 11:34:33 -07:00
sidharthamani
eaecd8b1b5 add syslog driver 
Signed-off-by: wlan0 <sid@rancher.com>
 2015-03-21 18:01:18 -07:00
Lloyd Dewolf
6ca1494f19 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>
 2015-03-19 13:59:40 -07:00
Arnaud Porterie
1ff5a91007 Merge pull request #10568 from LK4D4/logging_drivers 
Logging drivers
 2015-03-17 09:45:58 -07:00
Andy Goldstein
a2b0c9778f 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>
 2015-03-17 10:10:42 +00:00
Jessie Frazelle
da24ba42e2 Merge pull request #11239 from thaJeztah/docs-tables-in-run-reference 
docs: use more tables in run reference and minor fixups
 2015-03-16 18:02:42 -07:00
Alexander Morozov
02c1dd899a Merge pull request #10238 from miminar/ephemeral-port-range-allocation 
Use system's ephemeral port range for port allocation
 2015-03-13 15:18:05 -07:00
Alexander Morozov
bdf3a0295d Fail docker logs on all logging drivers apart from 'json-file' 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-13 15:02:09 -07:00