Commit Graph

5558 Commits

Author SHA1 Message Date
5c8645e25c Merge pull request #24705 from thaJeztah/update-flag-descriptions
Improve flag help consistency, and update docs
Upstream-commit: de64324109d2694b1525e62b5c0072267282a36c
Component: engine
2016-07-18 16:07:23 +00:00
a878f5d7fb Merge pull request #24714 from allencloud/better-docker-network-create-help-output
better command `docker network create -h` output
Upstream-commit: 98a4b3e332b908d5be6f59a0612b597653ccdee0
Component: engine
2016-07-18 16:05:46 +00:00
7065751fcb Fix link errors in 'docs/reference/api/docker_remote_api_v***.md'
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update fix-link-err-in-docs

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update fix-link-err-in-docs

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update fix-link-err-in-docs

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: f9ef10f853576d67d73b785deb53ecec84c31e63
Component: engine
2016-07-19 02:53:03 +08:00
0ad86942d1 Fix inconsistent fields for resource settings on service for API docs
In API docs, `CPU` and `Memory` were used for resource settings on
services. The actual settings should be `NanoCPUs` and `MemoryBytes`.

This fix address the inconsistent fields between API docs and actual
settings.

This fix fixes #24058.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 0159ee1f5dcd28dad1f621d17b9321f35f171b29
Component: engine
2016-07-17 16:45:09 -07:00
a5d67e2744 docs: update Oracle support link
The none-https url results in a redirect
to https://support.oracle.com/epmos/faces/MosIndex.jspx?......
which our link-checker didn't like.

The https link looks to be a direct link,
and not resulting in a redirect, so updating the URL.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c15144c4ec25df4234129fbe88b89cd4f709f784
Component: engine
2016-07-16 14:34:07 +02:00
cd03aec1cb better command docker network create -h output
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: d0081a0f476f91b0dc6b28c480e7c95c06b05ebb
Component: engine
2016-07-16 15:32:17 +08:00
cff2c54d47 Merge pull request #24682 from justincormack/oom-score-adj-doc
Document --oom-score-adj flag in docker run
Upstream-commit: 9ad857a78879420308a935ad80881311bc5e261f
Component: engine
2016-07-16 03:00:51 +02:00
c4e34ed5c5 Improve flag help consistency, and update docs
This adds the `--live-restore` option to the documentation.

Also synched usage description in the documentation
with the actual description, and re-phrased some
flag descriptions to be a bit more consistent.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 64a8317a5a306dffd0ec080d9ec5b4ceb2479a01
Component: engine
2016-07-16 01:58:01 +02:00
25e8fa8dc7 fixed cut-and-paste error on description of Docker Toolbox
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 6f9e310831326b8031a3526282ffd82cee94294f
Component: engine
2016-07-15 13:54:34 -07:00
dccb2477f1 Merge pull request #24610 from sfsmithcha/rc4_tutorial_check
update create swarm and add nodes to use the auto-generated join command
Upstream-commit: 9a9fc01af8fb5d98b8eec0740716226fadb3735c
Component: engine
2016-07-15 19:09:36 +02:00
d1f2c3f2ad Merge pull request #24638 from miaoyq/fix-docs-err
Delete  redundant content of 'docs/extend/plugins.md'
Upstream-commit: 80ec9fa284c22bc0df617c3d55c49cbbddfb8bb8
Component: engine
2016-07-15 17:04:11 +02:00
31552e5edc Document --oom-score-adj flag in docker run
This was only mentioned in docker create documentation.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 6ba6265d1ad86680ad7f7750ae1f9abb72f1e728
Component: engine
2016-07-15 14:11:54 +01:00
c93bbd4d7a Fix aufs docs
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 92dfbc1e2d48164e1100718be42115c26d40dc6e
Component: engine
2016-07-15 13:57:38 +08:00
346295e672 Delete redundant content of 'docs/extend/plugins.md'
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

Update plugins.md

Update plugins.md
Upstream-commit: cfe9d2ff1eded7e9bb9b798e780a251c6fc26ef9
Component: engine
2016-07-15 11:26:10 +08:00
7d2ad0787e Merge pull request #24654 from crosbymichael/enable-systemctl
Enable docker.socket and docker.service in fedora install docs
Upstream-commit: 9df2a825bad0d5d6d23742f58dfefc962953b91c
Component: engine
2016-07-15 01:42:31 +02:00
a7897f1409 State that docker supports fedora 24
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 6780bdcbad3ab3b3de1568e51db676bb0f059cd8
Component: engine
2016-07-14 16:24:21 -07:00
04ff70ab75 Enable docker socket and service on fedora
Make sure that the users enable both the socket and service for docker
as part of the default install instructions.  If both are not enabled
docker will not start at boot and restart containers.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 7a93a87c1a254abbf8e68093d4be241097694bb1
Component: engine
2016-07-14 16:23:05 -07:00
607a298d5c update create swarm and add nodes to use the auto-generated join command
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: fec803f7793ce347fe276ea93c13fb9022677135
Component: engine
2016-07-14 11:26:46 -07:00
6179c27dae docs: correct the placement constraints docker service example
- the constraint expression needs to be quoted
- add an actual redis container to run so the command line works

Signed-off-by: Anil Madhavapeddy <anil@docker.com>
Upstream-commit: c37da1792d232b5a8545227d5819bb245df16023
Component: engine
2016-07-14 17:38:37 +01:00
d37c862586 Merge pull request #24630 from eskaaren/status_409
Status code 409 received when conflicting name when creating container
Upstream-commit: e056b4e370077bbc92e27762e2843895e83dcd12
Component: engine
2016-07-14 15:26:21 +02:00
51ece55ad4 Status code 409 received when conflicting name when creating container
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>
Upstream-commit: 5bf46cc43624f230fae80430dd9d1d5f494c0c95
Component: engine
2016-07-14 14:58:43 +02:00
d2af4bb5e5 Merge pull request #24628 from vdemeester/service-doc-fixes
Service doc fixes
Upstream-commit: e7e9f753e81110b7d5845663690e741388528640
Component: engine
2016-07-14 11:38:07 +02:00
c6ba347661 Merge pull request #24588 from justincormack/nonewprivsdoc
Expand the documentation of "no-new-privileges"
Upstream-commit: 9c5782280c0143d061be119e93312099a8e7effc
Component: engine
2016-07-14 11:34:33 +02:00
d0a542295a Update service inspect --pretty reference docs
Update the output and fix wrong usage in a tutorial page.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: cc651bc642e3478062416b50171dbf5595daf4e4
Component: engine
2016-07-14 11:23:03 +02:00
d221553eec Update service update commandline reference docs
Update with the new remove flags

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: dbe310eff05cf5b67eab99d3cfff66c2680d01ac
Component: engine
2016-07-14 11:22:18 +02:00
b84397788e Use spaces, not tabs, to format sample "swarm join" command
Using tabs here seems to cause copy/paste problems in some terminals.
Using spaces is safer.

Fixes #24609

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 6de8fcb2f2baf335fc24e10909078199af528e8d
Component: engine
2016-07-13 19:31:05 -06:00
f731a7777f Merge pull request #24591 from thaJeztah/remove-shorthand-flagz
Remove shorthand flags for "mount", "pretty", and "no-resolve"
Upstream-commit: 1f74917f60edf8d7051a0c19481e7133e1b4537d
Component: engine
2016-07-13 12:51:53 -07:00
df6d3b4289 Merge pull request #24516 from crosbymichael/oom-score
Add --oom-score-adjust to daemon
Upstream-commit: ef322a3fbb31c2299e414f1c314f245c527ac3ea
Component: engine
2016-07-13 18:39:30 +00:00
b43802545b Merge pull request #24565 from thaJeztah/fix-node-inspect-formatting
docs: fix output of node inspect
Upstream-commit: 1dbe3f6e89e68e9f5cc8839dacc4f10281db1ead
Component: engine
2016-07-13 18:57:05 +02:00
bb985637e2 Remove shorthand flags for "mount", "pretty", and "no-resolve"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7bf0faf42377a91a8535b443201d9ad62326889b
Component: engine
2016-07-13 18:47:29 +02:00
f08872faee Merge pull request #24525 from vdemeester/24196-remove-command-flag-on-service-update
Remove --command flag for service update
Upstream-commit: 58624acf11405c482ff0abbc9674cd5441ccce57
Component: engine
2016-07-13 16:01:11 +00:00
1348489290 Remove --command flag for service update
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: e4a024d5902df1d3db8b9fff8865304afa2305e6
Component: engine
2016-07-13 16:19:21 +02:00
87b7341bb5 Expand the documentation of "no-new-privileges"
The change to runc in https://github.com/opencontainers/runc/pull/789
was not documented previously. Also say what this affects and clean
up layout of initial table as there was some miscolouration of the
continuation lines.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 3050d9af9b2384baed599be9d7142b4775f89e10
Component: engine
2016-07-13 14:41:58 +01:00
891b2576ba Merge pull request #24562 from thaJeztah/carry-24499-swarm-info-consistency
[carry 24499] Remove "Yes"/"No" and use "true"/"false" consistently in `docker info`
Upstream-commit: 92b15778712ff2eb85bf5b7e00fb4fe4310fd6b1
Component: engine
2016-07-13 15:13:58 +02:00
3af50e048c Merge pull request #24560 from thaJeztah/remove-execution-driver
docs: remove executiondriver from API 1.24 docs
Upstream-commit: 9d236d88b78b02ff11f76043522525a9d35e6372
Component: engine
2016-07-13 10:43:13 +02:00
f16f188274 fix the docker run --readonly example. rename '/icanwrite here' to '/icanwrite/here'
Signed-off-by: Mei ChunTao <mei.chuntao@zte.com.cn>
Upstream-commit: acbe38a3ccb85be012d88f3109b688f8b815daaf
Component: engine
2016-07-13 08:21:26 +08:00
629585dfca docs: fix output of node inspect
The output uses tabs, but those don't
translate well to the rendered output in
the docs, so replacing the tabs with spaces.

Also updates the output, because REPLICATED,
and SPREAD are no longer all-caps in the
actual output.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 477a5f8fb0be1244858614cdda2d2528208fc88a
Component: engine
2016-07-13 01:53:51 +02:00
937633217f Make labels human readable
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ea365e4cb37d037046364773d01a744b1258ce4e
Component: engine
2016-07-13 01:08:54 +02:00
53c33cc1be Add --oom-score-adjust to daemon
This adds an `--oom-score-adjust` flag to the daemon so that the value
provided can be set for the docker daemon's process.  The default value
for the flag is -500.  This will allow the docker daemon to have a
less chance of being killed before containers do.  The default value for
processes is 0 with a min/max of -1000/1000.

-500 is a good middle ground because it is less than the default for
most processes and still not -1000 which basically means never kill this
process in an OOM condition on the host machine.  The only processes on
my machine that have a score less than -500 are dbus at -900 and sshd
and xfce( my window manager ) at -1000.  I don't think docker should be
set lower, by default, than dbus or sshd so that is why I chose -500.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: a894aec8d81de5484152a76d76b80809df9edd71
Component: engine
2016-07-12 15:53:15 -07:00
b912567a85 docs: remove executiondriver from API 1.24 docs
the executiondriver property was removed in
880484992c360881dc57a3317b84d75300c358af, but docs
were only updated for the 1.25 API, not for 1.24

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3c6ef4c29d28e92ea29816d6117412162d829c60
Component: engine
2016-07-13 00:49:29 +02:00
231ed0ed4e Merge pull request #23324 from icecrime/add_run_network
Add run network
Upstream-commit: 778b38cbf1f03d54ef86ba79882af45d653e71b0
Component: engine
2016-07-12 14:59:48 -07:00
6e41fcca17 Merge pull request #24550 from thaJeztah/fix-evil-links
Fix some broken sourceforge.net links
Upstream-commit: e794fe2750545be6aee237b189e50a0e66c3d81e
Component: engine
2016-07-12 22:25:19 +02:00
1a5d7b10d7 Merge pull request #24552 from thaJeztah/add-none-join-mode
Add "auto-accept=none" to documentation
Upstream-commit: d0b495f6b12fb02fd0742252d4ff90d7b02e523d
Component: engine
2016-07-12 22:21:23 +02:00
be4ee8451b Add "auto-accept=none" to documentation
The "none" option was not added to the documentation.
This adds an example, and adds additional information
on manually accepting or rejecting a node.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 06517753c19262129202b224a35965a2686e49e9
Component: engine
2016-07-12 22:06:01 +02:00
3b51db3f13 Merge pull request #24544 from sfsmithcha/network_plugins_swarm_mode
author merge: add caveat for network plugins in swarm mode
Upstream-commit: cbdce5800896a15b3a19c0178a7e367ac7072af5
Component: engine
2016-07-12 13:05:05 -07:00
a4c4731dc9 Rename --net to --network
Add a `--network` flag which replaces `--net` without deprecating it
yet. The `--net` flag remains hidden and supported.

Add a `--network-alias` flag which replaces `--net-alias` without deprecating
it yet. The `--net-alias` flag remains hidden and supported.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: c0c7d5e71586ec8e4d54aef9e061f061e9223cc4
Component: engine
2016-07-12 13:01:35 -07:00
2fa3ccc004 Fix some broken sourceforge.net links
Looks like there's issues with sourceforge project
pages. Given that sourceforge isn't really what
it used to be, trying to find alternative URLs
where possible.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0e7a1079be5e87aae2abcda7c27a2b0e67270a50
Component: engine
2016-07-12 21:51:14 +02:00
b2c20d32a7 add caveat for network plugins in swarm mode
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 9ae64de6143451b0c3a3b2fe368b1c365b10e1a4
Component: engine
2016-07-12 11:50:34 -07:00
9b4a3ab43b Merge pull request #24518 from dmcgowan/overlay2-override-kernel-check
Allow option to override kernel check in overlay2
Upstream-commit: a44f0107023aa62d202b068c0a8d4b5ad0640838
Component: engine
2016-07-12 19:22:27 +02:00
36cae188de Merge pull request #24146 from johnharris85/fix-swarm-update-auto-accept
Add comma-separated --auto-accept support.
Upstream-commit: 7da11b1afda5f42d07b7304a7edcd1886434d9ed
Component: engine
2016-07-12 16:29:21 +02:00