Commit Graph

70 Commits

Author SHA1 Message Date
b4919d1406 docs: Updated for docker cp and its API changes
Documented changes to API to enable new `docker cp` behavior.

Added documentation on `docker cp` usage and behavior.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: e54b1e081ae15a71e758f7d2691dc2bff3f66e02
Component: engine
2015-07-21 15:30:20 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
fb50eb6afa Merge pull request #14315 from Pensu/14176-fix-run-table-rendering
Fixing the table rendering in reference/run.md
Upstream-commit: 9c96304a86b14cb80af46c45c516c38ed4df8ba2
Component: engine
2015-07-07 18:09:53 -07:00
c17c7fce57 Revert "Fix implicit DeviceMapper selection"
This reverts commit 0a376291b2213699f986a7bca1cc8c4f4ed00f8d.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9af7afb9eb138bdba33c22445f36f41e5aa26bd1
Component: engine
2015-07-07 12:27:19 -07:00
63dcc74119 Merge pull request #14307 from kolyshkin/readme-fixes
README.md: fix cgroups/namespaces name and link
Upstream-commit: 833cdd28ed668291bca8eb5ee5ba73a77523eafb
Component: engine
2015-07-07 06:09:20 -07:00
f43c5d8e7a Merge pull request #14406 from duglin/tweakCmdlineHelp
Fix example in cmdline help text to have correct output
Upstream-commit: 270d7e1af8075f8c05f820d4a9a40f0aebd3ca28
Component: engine
2015-07-07 09:26:13 +02:00
48ac43bc1b Merge pull request #13987 from larsks/bug/7583
Update docker commit man page re: volumes
Upstream-commit: 244141a8aa4b80c6e508eb408a536a56b783845b
Component: engine
2015-07-07 09:16:54 +02:00
02dcc46d4e Merge pull request #14095 from timwraight/master
Clarify .dockerignore example for Markdown files
Upstream-commit: a25ee91f1c163ef77539eafd0509ccfcf619106d
Component: engine
2015-07-07 07:59:39 +02:00
a32ec20c5e daemon.md: fix placement of exec driver heading
Options for zfs storage driver were incorrectly placed
under 'exec driver options' header. Move the header to
the correct place.

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Upstream-commit: 68efb27e990a52478d9927911757a07910244dc5
Component: engine
2015-07-06 22:51:31 -07:00
4813a5b1aa Fix example in cmdline help text to have correct output
Showing "$$ exit 13" caught my eye and wasn't correct.
While in there I also made it so the following paragraph didn't go past 80 chars

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: aea0fd0115ab99a9797cc2ba4d9ef530f76c3ecc
Component: engine
2015-07-06 17:51:09 -07:00
d3498560e9 Merge pull request #14154 from chrismckinnel/master
Fix a broken link to .dockerignore
Upstream-commit: 6ffce0131c6be276d5919dff0500db7a67065b4d
Component: engine
2015-07-06 15:48:25 -07:00
c016079ee2 Add some missing events to the API docs
Closes #14407

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 4bb3c253e83454e00381723f17ca69dd4e9b3d7a
Component: engine
2015-07-06 11:39:37 -07:00
d49aa7e5dc Update docker commit man page re: volumes
Update the man page for 'docker commit' to make explicit the fact that
'commit' does not save data in volumes.

Addresses comments in #7583

Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
Upstream-commit: a9747895375a27e0f4d46d9cf8f501815e5b2642
Component: engine
2015-07-06 10:16:21 -04:00
bc7c7e9f54 Merge pull request #14292 from calavera/fix_driver_detection
Fix implicit DeviceMapper selection
Upstream-commit: f0ed68f852e33ed21420959790be4741725b03b1
Component: engine
2015-07-02 11:33:55 -07:00
740b021c6a Fix implicit DeviceMapper selection
DeviceMapper must be explicitly selected because the Docker binary might not be linked to the right devmapper library.

With this change, Docker fails fast if the driver detection finds the devicemapper directory but the driver is not the default option.
The option `override_udev_sync_check` doesn't make sense anymore, since the user must be explicit to select devicemapper, so it's being removed.
Docker fails to use devicemapper only if Docker has been built statically unless the option was explicit.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 0a376291b2213699f986a7bca1cc8c4f4ed00f8d
Component: engine
2015-07-02 09:21:27 -07:00
fb988a52e9 add support for maximum log size, and max number of log files
Signed-off-by: wlan0 <sidharthamn@gmail.com>
Upstream-commit: 9b782d3af322bd8d9cf857d63eb7f2e0fe484c90
Component: engine
2015-07-02 06:26:06 -07:00
23dd86bcae Unify docker commands' usage in man and help
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: f38232b475d126d6ea3a37d82be2c7269324e4ab
Component: engine
2015-07-02 10:33:26 +08:00
8aaef3e5b3 Flag Addition: --type flag added for docker inspect command
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 2cb74e691538351efbdee7a78be6535f22c5d024
Component: engine
2015-07-01 12:14:01 -04:00
fda86a6f5b Fixing the table rendering in reference/run.md
Signed-off-by: Peeyush Gupta <gpeeyush@linux.vnet.ibm.com>
Upstream-commit: 636ec6383be4cb7c776940565a06d5500e0608bd
Component: engine
2015-07-01 16:07:39 +05:30
14f61357df Typo in memory-swap flag
Fixes #14253

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: e7e48bcfddf8f2a28fcb79f0282afd1fc86133fb
Component: engine
2015-06-29 13:12:08 -07:00
4f74d3f3bd Closes #13323 and carries
Entering comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 078b23a37daf95101bf31bafc7f8396af7ad7d98
Component: engine
2015-06-29 06:18:41 -07:00
9c2998785f Fix a broken anchor tag on the CLI builder page
Signed-off-by: Chris McKinnel <chrismckinnel@gmail.com>
Upstream-commit: 3c5b17cf7ee2a5830396a033091b8c551da37d3c
Component: engine
2015-06-26 09:43:30 +01:00