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
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
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
Yuan Sun
4f492e794a
update docker_remote_api_v1.*
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-04-11 18:11:49 +08:00
Lei Jitang
72a500e9e5
Add docker exec run a command in privileged mode
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-04-11 11:26:37 +08:00
Lei Jitang
2cce4791b0
Add -u|--user
flag to docker exec for running command as a different user
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-04-11 11:04:24 +08:00
Deng Guangxing
795a58fb44
'docker rmi -f IMAGE_ID' untag all names and delete the image
...
If an image has been tagged to multiple repos and tags, 'docker
rmi -f IMAGE_ID' will just untag one random repo instead of
untagging all and deleting the image. This patch implement
this. This commit is composed of:
*untag all names and delete the image
*add test to this feature
*modify commandline/cli.md to explain this
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
2015-04-11 09:24:21 +08:00
Tibor Vass
23c12dabbd
Merge pull request #11412 from vbatts/vbatts-dm_sync_is_required
...
devmapper: udev sync is a requirement
2015-04-10 16:52:38 -04:00
Vincent Batts
0e21782de5
devmapper: storage-opt override for udev sync
...
This provides an override for forcing the daemon to still attempt
running the devicemapper driver even when udev sync is not supported.
Intended to be a very clear impairment for those choosing to use it. If
udev sync is false, there will still be an error in the daemon logs,
even when the override is in place. The docs have an explicit WARNING.
Including link to the docs for users that encounter this daemon error
during an upgrade.
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-04-10 15:43:16 -04:00
moxiegirl
6ab4878a01
Merge pull request #12218 from draghuram/apidoc_12055
...
Adds example request and Json parameter information for container
2015-04-10 11:22:57 -07:00
Arnaud Porterie
7cec5f50c5
Merge pull request #12209 from ahmetalpbalkan/daemon/cli-help-log-driver-reword
...
cli: Better wording for daemon --log-driver
2015-04-10 08:29:29 -07:00
Raghuram Devarakonda
202e0380f3
Adds example request and Json parameter information for container
...
start API.
Closes #10304 .
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
2015-04-10 11:10:41 -04:00
Tibor Vass
fa2ace00a8
Rebase + some fixes
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-04-09 21:29:42 -04:00
David Young
8d682bf734
Refine document by review comments
...
Signed-off-by: David Young <yangboh@cn.ibm.com>
2015-04-09 21:29:42 -04:00
David Young
bf57339527
Add comment column in docker history command output
...
Signed-off-by: David Young <yangboh@cn.ibm.com>
2015-04-09 21:29:41 -04:00
Ahmet Alp Balkan
a4b7a9e1e5
cli: Better wording for daemon --log-driver
...
This flag is passed to the daemon CLI. In my opinion, "Container's
logging driver" is not accurate and refers to 'one container'.
Also the `syslog` driver was missing from the list. Having the list
of all logging drivers won't scale here (should be <80 chars per line)
and we have `rotation` driver coming up in the pipeline as well (gh11485).
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-04-09 02:12:44 -07:00
Ahmet Alp Balkan
b66597eef1
docs: Markdown format fix around LogConfig param
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-04-08 16:16:37 -07: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
Mary Anthony
87e70b6831
Carry PR 12008 for contributor
...
Closes #8040
Remove a tic for the hawk
Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-07 14:09:53 -07: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
moxiegirl
ce18734c2c
Merge pull request #12055 from l0kix2/patch-1
...
Improved "start a container" section 1.16 & 1.17 API docs
2015-04-06 11:41:38 -07:00
Arnaud Porterie
ed8d402851
Merge pull request #11978 from x1022as/info-show-loggingdriver
...
docker info show logging driver info
2015-04-06 11:11:31 -07:00
moxiegirl
d489b91aa9
Merge pull request #11915 from ZJU-SEL/fix_issue_11676_11754
...
clarify RLIMIT_AS is disabled, explain how to edit DOCKER_OPTS
2015-04-06 09:23:53 -07:00
Deng Guangxing
71de711189
fix typo in cli.md
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
2015-04-06 16:11:40 +08:00
Simei He
5057d7da13
fix the space thing.
...
Signed-off-by: Simei He <hesimei@zju.edu.cn>
2015-04-06 09:00:59 +08:00
Kirill SIbirev
ac12c80537
Improved "start a container" section in 1.16 & 1.17 docs
...
It seems it was lost or something
Signed-off-by: Kirill Sibirev <l0kix2@gmail.com>
2015-04-04 11:23:49 +03:00
moxiegirl
fb1e10284b
Merge pull request #11968 from thaJeztah/docs-fix-bullets-and-labels-filter
...
docs: fix bullet list and missing label filter
2015-04-03 12:33:22 -07:00
Simei He
8c578b8190
minor edits.
...
Signed-off-by: Simei He <hesimei@zju.edu.cn>
2015-04-03 14:43:21 +08:00
Tibor Vass
9707286a5c
Merge pull request #11149 from duglin/8667-AdvancedVars
...
Add support for advanced ${} uses
2015-04-02 08:25:49 -04:00
Sebastiaan van Stijn
37c7f3a204
docs: fix bullet list and missing label filter
...
Some bullet lists didn't render as bullet-lists because
of a missing newline.
Also added missing "label" filter for `docker ps` and
slightly re-worded the header above the supported filters.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-04-02 01:48:28 +02:00