320928e0b8
Merge pull request #14727 from vdemeester/opts-docs-updates
...
Update documentation according to opts updates (#13694 )
Upstream-commit: 1e9394103c9dee8fb363ac37695775fbc61b9c2d
Component: engine
2015-07-21 14:19:29 +02:00
5a80e110cb
Update documentation according to opts updates
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: dc8b765930168bbdce1189b702050b5a020c15af
Component: engine
2015-07-21 14:08:19 +02:00
cbb8acf897
Merge pull request #14766 from runcom/remove-ref-from-libcontainer
...
Remove reference to docker/libcontainer
Upstream-commit: 197c9010bc0ea2cfab444f68247776391f471730
Component: engine
2015-07-21 12:49:36 +02:00
6c8aab1b9c
Merge pull request #14744 from gesellix/add-gradle-docker-remote-api-plugin
...
Add gradle docker remote api plugin
Upstream-commit: f0473eaf01002263f59139716a018d267c1bd6f1
Component: engine
2015-07-21 08:34:08 +02:00
63185229e8
Merge pull request #14768 from fredlf/style-guide-edits
...
Small edits and clean up
Upstream-commit: 8b7923620ac5f7a40806e2ed22616231a5965b14
Component: engine
2015-07-21 00:23:56 +02:00
c8933bf1c2
Small edits and clean up
...
Signed-off-by: Fred Lifton <fred.lifton@docker.com >
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 6609cfb5e743b67e21c60296b0edda643551aa3b
Component: engine
2015-07-20 11:59:48 -07:00
09a470656b
Remove reference to docker/libcontainer
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 691e3a3e7070ca43a9ad8f5f99c2563ccdce98a5
Component: engine
2015-07-20 20:30:22 +02:00
da9ff50d73
Simplify swappiness check
...
As suggested in https://github.com/docker/docker/pull/14004/files#r34022527
The concern there is we can't differentiate whether user explicitly
asked for an invalid value of -1 or he did not specify anything.
I don't think this would be a problem, because:
- like all other default values like zero, we can't differentiate
user specify it or not, most of which, zeros are also invalid, so
default is default, we show these default values in help info,
so users would know if they set value as default, it'll be like
they set nothing.
- we can't do this kind of string check in REST api request, so
it'll make the behave different from docker command and RESTapi.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 6f8ddec1d0e67058c7a4a15c7d4d9a75bc1e5dea
Component: engine
2015-07-20 16:10:10 +08:00
e8c2670622
Updating to use the new base
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: e0bceb70647499ec3660204731a1b42ced927492
Component: engine
2015-07-19 15:39:43 -07:00
6212ad7f28
Merge pull request #14715 from icecrime/14365_remove_rhel6_from_docs
...
Update RHEL/Centos/Fedora installation docs
Upstream-commit: ccc78c9968b6cfd6cdf85c28953453c2cd0aa95b
Component: engine
2015-07-19 13:00:50 -07:00
d824694b36
add gradle-docker-plugin, update docker-client url
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
Upstream-commit: a51684ff8f44a8c54a8724847fe345487f478d14
Component: engine
2015-07-19 21:28:11 +02:00
e480c92f68
remove unused row-even and row-odd css classes
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
Upstream-commit: 38e7069668e4a690bd47108db26f8d6f9966e414
Component: engine
2015-07-19 21:27:12 +02:00
a68f23c05d
Merge pull request #14676 from duglin/Issue14675
...
Add missing 'Names' field to /containers/json API output
Upstream-commit: 32764fe3b907dfe4d3e833c19fc605859adba47e
Component: engine
2015-07-19 06:53:25 -07:00
2138eae5bf
Merge pull request #14667 from charleswhchan/patch-5
...
Trim excess from image. Based on the context, the email itself is sufficient.
Upstream-commit: a89370039a65f235d3dde5d36f20d0f463c615e9
Component: engine
2015-07-18 11:14:28 +02:00
428f8fb7db
Update RHEL/Centos/Fedora installation docs
...
Remove mentions of older systems.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 340bd135ddf9a053dc6106a874e70e021a9e6acb
Component: engine
2015-07-17 14:04:19 -07:00
c4955551ce
Merge pull request #11485 from wlan0/rollover_log
...
Add rollover log driver, and --log-driver-opts flag
Upstream-commit: 415f744d0c5980d332ab54c80f1521a0e5b4d401
Component: engine
2015-07-17 22:41:26 +02:00
e191f54133
Add missing space
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: ceca4109fac5367f7c354b675cadf086dc1e09c3
Component: engine
2015-07-16 22:49:46 -07:00
89efa010e2
Merge pull request #14571 from charleswhchan/patch-2
...
Documentation: Split apt-get example onto multiple lines
Upstream-commit: 8c77e3962777f4f693de7b4b064aac20306e4a4b
Component: engine
2015-07-16 18:32:56 +02:00
abf0842b64
Add missing 'Names' field to /containers/json API output
...
Closes #14675
Wasn't sure how far back I needed to go so I did just a few.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 081991c01e13c60af725bea91c4f5598dbcceaa9
Component: engine
2015-07-16 08:23:55 -07:00
573d9d9c73
Merge pull request #14670 from chenchun/fix_fluentd_link
...
Fix fluentd link name
Upstream-commit: b70428c4dd3c13a5903f6a3312396ae95ea916a3
Component: engine
2015-07-16 10:44:54 -04:00
d93b5bc4ca
Split apt-get example onto multiple lines. Use extra spaces to align the code block.
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: c4d2b34d13ac61d6c2b9caa2270763259e6c788c
Component: engine
2015-07-16 06:42:07 -07:00
38cf42fe8e
Fix fluentd link name
...
Signed-off-by: Chun Chen <ramichen@tencent.com >
Upstream-commit: ed23ecd305a063088bb22bcb4b4feaf1d46a79b4
Component: engine
2015-07-16 14:23:56 +08:00
a485469253
Trim excess from image. Based on the context, the email itself is sufficient.
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: f373bd97c3d1626563b20611947705e3bd00ac80
Component: engine
2015-07-15 20:15:57 -07:00
72b29b511a
Fix a typo: change "such Bash" to "such as Bash"
...
Signed-off-by: Anatoly Borodin <anatoly.borodin@gmail.com >
Upstream-commit: 5f9d1bc01876d31258bf2f86c6c2d9938eb680a9
Component: engine
2015-07-15 17:10:22 +02:00
79e7cafd39
Trusted build servers moved to AWS and use an elastic IP
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 174870e64fbaf3e949ee8d6e874548bc2af26811
Component: engine
2015-07-14 19:20:09 -07:00
ea5ef83f1e
update urls for rpms
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 24bb36297c1457d71114d678671f77001b6936a5
Component: engine
2015-07-14 15:26:11 -07:00
914754c805
Merge pull request #14501 from duglin/FixCommitDocs
...
Align 'docker commit' docs with the code
Upstream-commit: 892ac93ec9fce417dfca9ce397c8e1d771b604e8
Component: engine
2015-07-10 15:21:29 -07:00
f177b87b50
Merge pull request #14533 from natebrennand/update-docker-config-docs
...
update reference to config file
Upstream-commit: a828415286202343e680aa8372c01d062056dc4b
Component: engine
2015-07-10 15:20:52 -07:00
5b7992c914
Merge pull request #12856 from duglin/ConfigLocation
...
Add support for DOCKER_CONFIG/--config to specify config file dir
Upstream-commit: 5bf98dd997bbc4db2a70594669457417498212bd
Component: engine
2015-07-10 23:05:49 +02:00
3e1377983b
Add support for DOCKER_CONFIG/--config to specific config file dir
...
Carry #11675
Aside from what #11675 says, to me a key usecase for this is to support
more than one Docker cli running at the same time but each may have its
own set of config files.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: daced1d30345aca06857f874dfb48b7e90cb409b
Component: engine
2015-07-10 12:51:34 -07:00
44b29b0ccc
update reference to config file
...
`docker login` in 1.7 produces a config file in `~/docker/config.json`
instead of a `~/.dockercfg`.
Signed-off-by: Nate Brennand <nate.brennand@clever.com >
Upstream-commit: 6827782bef07afe440acc46676e4850734fcc991
Component: engine
2015-07-10 18:55:47 +00:00
d67b6b5d43
Merge pull request #14450 from hqhq/hq_fix_oom_kill_disable_doc
...
Fix docs for oom-kill-disable
Upstream-commit: 5bf335d0a22542a3b70ba879bc69333385efd749
Component: engine
2015-07-10 11:15:02 -07:00
9c232ce453
Merge pull request #14478 from atilacamurca/patch-1
...
Update run.md
Upstream-commit: 471fbc9b9984b6f6dd8303363655adc360388f7d
Component: engine
2015-07-10 11:13:51 -07:00
5b5bcdcb21
Align 'docker commit' docs with the code
...
It was missing some variants and 'maintainer' isn't actually supported.
Also sorted the list of allowed cmds in the code just to make it easier
to diff with the docs.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 0bf0e5a6efb6d4718f18db11084295aaba2062e3
Component: engine
2015-07-09 13:17:47 -07:00
d257ad21f6
Merge pull request #14241 from ZJU-SEL/fix-ulimit-usage
...
Fix ulimit usage of nproc
Upstream-commit: ca3e4ccb809dc283c91deb304876a211eb546265
Component: engine
2015-07-09 08:23:26 +02:00
228bda77d9
Clarify that nproc is not for per container
...
Fix ulimit nproc spec in daemon
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn >
Upstream-commit: 54ac3ad736d633956a89aa478c6eb89d648a34df
Component: engine
2015-07-09 02:40:47 +00:00
13aec7c910
update doc
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: d2cde4fa6688b98433c7870a211b5172250c4b47
Component: engine
2015-07-08 15:42:41 -07:00
07f5189707
Merge pull request #14494 from HuKeping/update-docs
...
docs: update docs for API history
Upstream-commit: aaf1426995e8a2b5850598e384db4d07eb4d939c
Component: engine
2015-07-14 08:16:00 -04:00
d59656f4c5
docs: update docs for API history
...
The response of hitory API includes more information now.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 29660f263e07db404cf95b6a2efdc503e6dea2d2
Component: engine
2015-07-14 19:54:24 +08:00
e7044bb830
Docs: fix commandline doc create.md and run.md
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: c3b77bbe8b69d1588320eb5a6a6fd152f68e10bd
Component: engine
2015-07-14 09:26:59 +08:00
4c94e1cdab
Merge pull request #10717 from mrunalp/feature/group_add
...
Adds support for specifying additional groups.
Upstream-commit: 35b02239216d7c976d4b07022429fec25ff9669d
Component: engine
2015-07-13 17:08:05 -07:00
2aff354ec5
add --format flag to docker version
...
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com >
Upstream-commit: 41588a57662456f1a27c48921c680ac2a6e079c3
Component: engine
2015-07-13 19:10:56 -04:00
1bf7ad599f
Merge pull request #14581 from vdemeester/14573-docs-docker-bestpractice-fix
...
Fixes TOC in dockerfile_best_practices.md
Upstream-commit: 73bd855dcc7f5878f9cc638f37a3c2b32a433426
Component: engine
2015-07-13 15:14:56 -07:00
aff29f60ab
Fixes TOC in dockerfile_best_practices.md
...
Decided to put the link in a reference word.
Closes #14573
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: d03923732f36628f1897c03d5cba7653f156c5c2
Component: engine
2015-07-13 23:46:04 +02:00
8a8cd3160c
Adds documentation for additional groups.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: d77d0268eb1f419509ceb6670ff7aaa298314218
Component: engine
2015-07-13 14:47:28 -04:00
492b0deece
Fix typo in documentation
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 41def26c1b762b89d3dd0cb3339435f1144320ce
Component: engine
2015-07-13 19:17:33 +02:00
11e2c4a554
Add the memory swappiness tuning option to docker.
...
Memory swappiness option takes 0-100, and helps to tune swappiness
behavior per container.
For example, When a lower value of swappiness is chosen
the container will see minimum major faults. When no value is
specified for memory-swappiness in docker UI, it is inherited from
parent cgroup. (generally 60 unless it is changed).
Signed-off-by: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com >
Upstream-commit: 921da495d24695dda66d3f58e78887dd0bc2402e
Component: engine
2015-07-12 13:16:33 +05:30
9f51cb17df
Update run.md
...
Put a space after the `###` in the Example section. On the github parser the result file looks ok, but in the docker page (<https://docs.docker.com/reference/run/ >) looks ugly.
Signed-off-by: Átila Camurça <camurca.home@gmail.com >
Upstream-commit: 7121a2ae46510ce985073b1f18f1740364ec74a7
Component: engine
2015-07-08 16:09:40 -03:00
b21ee30343
Adding dockery as client lib to the docs
...
Signed-off-by: Robert Stern <lexandro2000@gmail.com >
Upstream-commit: cd454fef5a7bc965122efc7ecf4de2f6a29bc96b
Component: engine
2015-07-08 12:09:34 +02:00
5353b0d726
Fix docs for oom-kill-disable
...
Addresses: #14440
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: c92fb4d517281033a96fa05e0f1eadb899bfe2a3
Component: engine
2015-07-08 09:51:10 +08:00
