Commit Graph

5539 Commits

Author SHA1 Message Date
Sebastiaan van Stijn e056b4e370 Merge pull request #24630 from eskaaren/status_409
Status code 409 received when conflicting name when creating container
2016-07-14 15:26:21 +02:00
Eivin Giske Skaaren 5bf46cc436 Status code 409 received when conflicting name when creating container
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>
2016-07-14 14:58:43 +02:00
Sebastiaan van Stijn e7e9f753e8 Merge pull request #24628 from vdemeester/service-doc-fixes
Service doc fixes
2016-07-14 11:38:07 +02:00
Vincent Demeester 9c5782280c Merge pull request #24588 from justincormack/nonewprivsdoc
Expand the documentation of "no-new-privileges"
2016-07-14 11:34:33 +02:00
Vincent Demeester cc651bc642
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>
2016-07-14 11:23:03 +02:00
Vincent Demeester dbe310eff0
Update service update commandline reference docs
Update with the new remove flags

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-14 11:22:18 +02:00
Aaron Lehmann 6de8fcb2f2 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>
2016-07-13 19:31:05 -06:00
Tibor Vass 1f74917f60 Merge pull request #24591 from thaJeztah/remove-shorthand-flagz
Remove shorthand flags for "mount", "pretty", and "no-resolve"
2016-07-13 12:51:53 -07:00
Arnaud Porterie ef322a3fbb Merge pull request #24516 from crosbymichael/oom-score
Add --oom-score-adjust to daemon
2016-07-13 18:39:30 +00:00
Vincent Demeester 1dbe3f6e89 Merge pull request #24565 from thaJeztah/fix-node-inspect-formatting
docs: fix output of node inspect
2016-07-13 18:57:05 +02:00
Sebastiaan van Stijn 7bf0faf423
Remove shorthand flags for "mount", "pretty", and "no-resolve"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-13 18:47:29 +02:00
Arnaud Porterie 58624acf11 Merge pull request #24525 from vdemeester/24196-remove-command-flag-on-service-update
Remove --command flag for service update
2016-07-13 16:01:11 +00:00
Vincent Demeester e4a024d590
Remove --command flag for service update
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-13 16:19:21 +02:00
Justin Cormack 3050d9af9b 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>
2016-07-13 14:41:58 +01:00
Vincent Demeester 92b1577871 Merge pull request #24562 from thaJeztah/carry-24499-swarm-info-consistency
[carry 24499] Remove "Yes"/"No" and use "true"/"false" consistently in `docker info`
2016-07-13 15:13:58 +02:00
Sebastiaan van Stijn 9d236d88b7 Merge pull request #24560 from thaJeztah/remove-execution-driver
docs: remove executiondriver from API 1.24 docs
2016-07-13 10:43:13 +02:00
Mei ChunTao acbe38a3cc fix the docker run --readonly example. rename '/icanwrite here' to '/icanwrite/here'
Signed-off-by: Mei ChunTao <mei.chuntao@zte.com.cn>
2016-07-13 08:21:26 +08:00
Sebastiaan van Stijn 477a5f8fb0
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>
2016-07-13 01:53:51 +02:00
Sebastiaan van Stijn ea365e4cb3
Make labels human readable
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-13 01:08:54 +02:00
Michael Crosby a894aec8d8 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>
2016-07-12 15:53:15 -07:00
Sebastiaan van Stijn 3c6ef4c29d
docs: remove executiondriver from API 1.24 docs
the executiondriver property was removed in
880484992c, but docs
were only updated for the 1.25 API, not for 1.24

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-13 00:49:29 +02:00
Tibor Vass 778b38cbf1 Merge pull request #23324 from icecrime/add_run_network
Add run network
2016-07-12 14:59:48 -07:00
Sebastiaan van Stijn e794fe2750 Merge pull request #24550 from thaJeztah/fix-evil-links
Fix some broken sourceforge.net links
2016-07-12 22:25:19 +02:00
Sebastiaan van Stijn d0b495f6b1 Merge pull request #24552 from thaJeztah/add-none-join-mode
Add "auto-accept=none" to documentation
2016-07-12 22:21:23 +02:00
Sebastiaan van Stijn 06517753c1
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>
2016-07-12 22:06:01 +02:00
Charles Smith cbdce58008 Merge pull request #24544 from sfsmithcha/network_plugins_swarm_mode
author merge: add caveat for network plugins in swarm mode
2016-07-12 13:05:05 -07:00
Arnaud Porterie (icecrime) c0c7d5e715
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>
2016-07-12 13:01:35 -07:00
Sebastiaan van Stijn 0e7a1079be
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>
2016-07-12 21:51:14 +02:00
Charles Smith 9ae64de614 add caveat for network plugins in swarm mode
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-07-12 11:50:34 -07:00
Sebastiaan van Stijn a44f010702 Merge pull request #24518 from dmcgowan/overlay2-override-kernel-check
Allow option to override kernel check in overlay2
2016-07-12 19:22:27 +02:00
Sebastiaan van Stijn 7da11b1afd Merge pull request #24146 from johnharris85/fix-swarm-update-auto-accept
Add comma-separated --auto-accept support.
2016-07-12 16:29:21 +02:00
Doug Davis 71d404e2bc Merge pull request #24532 from yongtang/07122016-typo-docs
Fix a minor typo in swarm tutorial docs
2016-07-12 08:03:53 -04:00
Yong Tang 93fa7e7555 Fix a minor typo in swarm tutorial docs
This fix fixes a minor typo in swarm tutorial's delete service docs.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-07-12 05:00:39 -07:00
Sebastiaan van Stijn 110b2aecda Merge pull request #24504 from hqhq/soften_update_kmem
Soften limitation of update kernel memory
2016-07-12 13:58:17 +02:00
Sebastiaan van Stijn c7b283bbe3 Merge pull request #24519 from thaJeztah/add-pidmode-api-docs
Add missing API docs for HostConfig.PidMode
2016-07-12 12:31:58 +02:00
Dave Henderson 9af24ba3ac Clarify warning against using build-time variables for secrets
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2016-07-11 21:21:33 -04:00
Qiang Huang 08c7075c40 Soften limitation of update kernel memory
Kernel memory is not allowed to be updated if container is
running, it's not actually a precise kernel limitation.

Before kernel version 4.6, kernel memory will not be accounted
until kernel memory limit is set, if a container created with
kernel memory initialized, kernel memory is accounted as soon
as process created in container, so kernel memory limit update
is allowed afterward. If kernel memory is not initialized,
kernel memory consumed by processes in container will not be
accounted, so we can't update the limit because the account
will be wrong.

So update kernel memory of a running container with kernel memory
initialized is allowed, we should soften the limitation by docker.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-07-12 08:07:24 +08:00
Tibor Vass 880484992c Merge pull request #24501 from hqhq/remove_exec_driver
Remove execution driver
2016-07-11 16:54:36 -07:00
Sebastiaan van Stijn 2c9b5addc5
Add missing API docs for HostConfig.PidMode
The `--pid` flag was added in Docker 1.5.0, but the
API changes were not documented. In Docker 1.12.0,
`--pid=container:<name|id>` was added as an additional
option, but also undocumented.

This adds the missing API documentation for this
option.

Also see commits
47e3da848f (for 1.5.0), and
ebeb5a0422 (for 1.12.0).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-12 01:52:42 +02:00
Derek McGowan ff98da0607 Allow option to override kernel check in overlay2
Add option to skip kernel check for older kernels which have been patched to support multiple lower directories in overlayfs.

Fixes #24023

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-07-11 16:48:08 -07:00
johnharris85 8e14882773 Add support for comma-separated --auto-accept syntax.
Signed-off-by: John Harris <john@johnharris.io>
2016-07-11 15:47:04 -07:00
Sebastiaan van Stijn 6dc2dd4410 Merge pull request #23513 from mansinahar/update-content-trust-doc
Change content-trust doc to not point to images that don't exist #22730
2016-07-11 23:42:53 +02:00
Sebastiaan van Stijn c6d550be98 Merge pull request #24471 from joaofnfernandes/broken-link
Fixes broken link in docs.
2016-07-11 19:43:37 +02:00
Joao Fernandes 6c9b5da5a1 Fixes broken link in docs.
Fixes #24428

Signed-off-by: Joao Fernandes <joao.fernandes@docker.com>
2016-07-11 10:20:01 -07:00
Mansi Nahar 82d70f4409 Change content-trust doc to not point to images that don't exist #22730
Signed-off-by: Mansi Nahar <mmn4185@rit.edu>
2016-07-11 12:41:03 -04:00
Charles Smith c9e7390115 Merge pull request #24239 from ardnaxelarak/24130_clean_up_docs
[Docs code snippets] Make it obvious what is command what is result
2016-07-11 08:26:30 -07:00
Lucas Chi 7b3ac47fa4 Fix grammar in docker volumes tutorial
Signed-off-by: Lucas Chi <lucas@teacherspayteachers.com>
2016-07-11 10:34:02 -04:00
Qiang Huang 1fb1136fec Remove execution driver
We use containerd and there is no execution driver anymore.

Addresses: https://github.com/docker/docker/issues/24461

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-07-11 14:52:27 +08:00
Sebastiaan van Stijn 4b090ae5f2
Make archive links absolute
The archive is only available on docs.docker.com, and not
when doing a "make docs", so relative links will not resolve.

Making these links absolute, so that they always
point to the live "docs.docker.com" domain.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-08 12:06:36 -07:00
Justin Cormack 7102e09f29 Update binary install docs with new contents of tgz
This is now up to date with contents of 1.12 tgz

Also change usage to `dockerd` not `docker daemon`

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-08 13:33:41 +01:00