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

1003 commits

Author SHA1 Message Date
Jessie Frazelle
74bfa36753 Merge pull request #12165 from icecrime/optional_userland_proxy 
Optional userland proxy
 2015-05-07 14:01:16 -07: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
Tibor Vass
91fb4d672a Merge pull request #10766 from cpuguy83/stats_pull_once 
Allow pulling stats once and disconnecting.
 2015-05-04 22:28:01 -07:00
Sven Dowideit
bba5fd8caa spelling fix from Marc MERLIN 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-05-05 00:38:41 +00:00
Arnaud Porterie
f42348e18f Add --userland-proxy daemon flag 
The `--userland-proxy` daemon flag makes it possible to rely on hairpin
NAT and additional iptables routes instead of userland proxy for port
publishing and inter-container communication.

Usage of the userland proxy remains the default as hairpin NAT is
unsupported by older kernels.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-05-04 16:07:45 -07:00
David Calavera
0a2ccb1cb5 Merge pull request #12769 from calavera/git_build_fragment 
Use git url fragment to specify build reference and dir context.
 2015-05-04 12:48:24 -07: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
David Calavera
49fd83a25e Use git url fragment to specify reference and dir context. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-04 09:28:06 -07:00
Brian Goff
f3023a93d1 Allow pulling stats once and disconnecting. 
Adds a `stream` query param to the stats API which allows API users to
only collect one stats entry and disconnect instead of keeping the
connection alive to stream more stats.

Also adds a `--no-stream` flag to `docker stats` which does the same

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-04 10:49:13 -04: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
Jessie Frazelle
53bef64804 Merge pull request #10427 from jfrazelle/option-to-disable-systemd-cgroups 
Option to configure cgroup manager (adds --exec-opt)
 2015-04-29 10:00:41 -07:00
buddhamagnet
6fd8e485c8 add support for exclusion rules in dockerignore 
Signed-off-by: Dave Goodchild <buddhamagnet@gmail.com>
 2015-04-28 18:56:45 +01:00
Jessica Frazelle
2afcd10202 option to configure cgroups 
Signed-off-by: Jessica Frazelle <jess@docker.com>
 2015-04-27 17:50:39 -07:00
Jessica Frazelle
d4bbbe58dd Add docs for --exec-opt and setting native.cgroupdriver. 
update man pages.
update bash completion.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
 2015-04-27 17:04:28 -07:00
Daniel Nephin
cfd0f53b03 Add missing API docs about filtering by label. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-04-26 15:36:01 -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
Julien Barbier
81897adcee Adding doc 
Signed-off-by: Julien Barbier <write0@gmail.com>
 2015-04-25 15:25:51 -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
David Calavera
8bd5a95e1e Document the extra depth argument in git contexts. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-24 09:39:39 -07:00
Tristan Carel
47263c6514 Fix typo in builder reference 
Signed-off-by: Tristan Carel <tristan.carel@gmail.com>
 2015-04-23 12:10:47 +02: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
Alexander Morozov
3dc07162bd Merge pull request #12557 from rhatdan/journald 
Add journald as a supported logger for containers
 2015-04-22 17:20:10 -07:00
Sven Dowideit
b2aca01d95 Merge pull request #12513 from allingeek/patch-1 
builder.md - Changes to bring LABEL docs in line with 1.6 release.
 2015-04-23 08:58:59 +10:00
Dan Walsh
b88b2fa72e Merge branch 'master' of github.com:docker/docker into journald 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-04-22 17:37:26 -04:00
Fred Lifton
21c8d211e1 Merge pull request #12536 from mountkin/remove-unsupported-instructions-from-doc 
Remove some unsupported instructions in the docs.
 2015-04-21 14:08:31 -07: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
Jessie Frazelle
17d5450bc3 Merge pull request #10736 from coolljt0725/add_cpu_limit 
Add support cpu cfs_quota
 2015-04-20 17:55:01 -07:00
Jessie Frazelle
47b703593e Merge pull request #12430 from icecrime/11551_carry 
Add -H|--human command-line flag to `docker history`
 2015-04-20 17:28:24 -07:00
Arnaud Porterie
9838242db1 Merge pull request #9381 from lebauce/default-gateway 
Proposal: Allow specifying a default gateway for bridge networking
 2015-04-20 15:50:35 -07:00
Doug Davis
18c9b6c645 Add .docker/config.json and support for HTTP Headers 
This PR does the following:
- migrated ~/.dockerfg to ~/.docker/config.json. The data is migrated
  but the old file remains in case its needed
- moves the auth json in that fie into an "auth" property so we can add new
  top-level properties w/o messing with the auth stuff
- adds support for an HttpHeaders property in ~/.docker/config.json
  which adds these http headers to all msgs from the cli

In a follow-on PR I'll move the config file process out from under
"registry" since it not specific to that any more. I didn't do it here
because I wanted the diff to be smaller so people can make sure I didn't
break/miss any auth code during my edits.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-20 13:05:24 -07: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
Sylvain Baubeau
acb6127c1a Allow specifying a default gateway for bridge networking 
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com>
 2015-04-20 15:13:30 +02:00
Shijiang Wei
49be84842e Remove some unsupported instructions in the docs. 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2015-04-20 16:48:17 +08:00
Jeff Nickoloff
89df65be5d Update builder.md 
Single value labels do not work in 1.6 and multi-label instructions only work when separated by non-EOL whitespace.
I also added an example snip from the inspect output with the labels that are included in this guide.

Signed-off-by: Jeff Nickoloff <jeff@allingeek.com>
 2015-04-18 11:38:20 -07:00
Arnaud Porterie
ae5cf30c7c Add -H|--human flag to docker history 
Add a flag to print sizes and dates in human readable format.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-04-16 08:38:18 -07:00
Mary Anthony
fe8fb24b53 In with the old menu layout 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-15 19:02:01 -07:00
Brian Goff
f0c60f7085 Merge pull request #12387 from x1022as/inspect-logpath 
Inspect show right LogPath in json-file driver
 2015-04-15 14:28:39 -04:00
moxiegirl
2499baefdd Merge pull request #12399 from emirozer/master 
closes #8945
 2015-04-15 10:53:10 -07:00
Emir Ozer
960de9c8dd closes #8945 
Signed-off-by: Emir Ozer <emirozer@yandex.com>
 2015-04-15 15:31:23 +02:00
Deng Guangxing
acf025ad1b Inspect show right LogPath in json-file driver 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
 2015-04-15 11:51:24 +08:00
Qiang Huang
f8dc7e8754 Add cpuset-mems support for docker build 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-15 09:34:12 +08: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
wonderflow
d791f7e9f8 fix memory stats display document 
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
 2015-04-14 18:34:20 +08:00
David Calavera
d71c929d08 Fix JSON format in the remote api configuration examples. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-13 16:12:00 -07:00
Michael Crosby
12f7db1830 Merge pull request #12025 from coolljt0725/add_exec_with_user 
Add docker exec run command as a different user and in privileged mode
 2015-04-13 13:50:51 -07:00
Michael Crosby
6fa2a1e486 Merge pull request #12172 from ZJU-SEL/change_stats 
change memory usage display
 2015-04-13 13:32:45 -07: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
James Turnbull
e3dd323336 Merge pull request #12289 from sunyuan3/docker_remote_api 
update docker_remote_api_v1.19.md
 2015-04-11 09:27:36 -05:00
jianbosun
d6d8f45b04 change memory usage display 
using standard unix postfixes add unit test for display
also change doc for memory usage display change
for example GiB will be GB

Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
 2015-04-11 20:04:34 +08:00