Commit Graph

1046 Commits

Author SHA1 Message Date
667eed7772 Require listen address and advertise address to be an IP address or an interface name
Hostnames are not supported for now because libnetwork can't use them
for overlay networking yet.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: fca0b18dcba99a7fbb8b430a55dc7bf60d5c1356
Component: engine
2016-07-24 09:23:38 -07:00
2150ea40b1 Split advertised address from listen address
There are currently problems with "swarm init" and "swarm join" when an
explicit --listen-addr flag is not provided. swarmkit defaults to
finding the IP address associated with the default route, and in cloud
setups this is often the wrong choice.

Introduce a notion of "advertised address", with the client flag
--advertise-addr, and the daemon flag --swarm-default-advertise-addr to
provide a default. The default listening address is now 0.0.0.0, but a
valid advertised address must be detected or specified.

If no explicit advertised address is specified, error out if there is
more than one usable candidate IP address on the system. This requires a
user to explicitly choose instead of letting swarmkit make the wrong
choice. For the purposes of this autodetection, we ignore certain
interfaces that are unlikely to be relevant (currently docker*).

The user is also required to choose a listen address on swarm init if
they specify an explicit advertise address that is a hostname or an IP
address that's not local to the system. This is a requirement for
overlay networking.

Also support specifying interface names to --listen-addr,
--advertise-addr, and the daemon flag --swarm-default-advertise-addr.
This will fail if the interface has multiple IP addresses (unless it has
a single IPv4 address and a single IPv6 address - then we resolve the
tie in favor of IPv4).

This change also exposes the node's externally-reachable address in
docker info, as requested by #24017.

Make corresponding API and CLI docs changes.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: a0ccd0d42fdb0dd2005f67604cb81a5a6b26787e
Component: engine
2016-07-24 09:23:07 -07:00
44cb49a379 Update swarm init task-history-limit docs
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 180f8c61bb1d3f05c21e697147b2f75a44bda485
Component: engine
2016-07-24 11:13:06 +02:00
66e0358be6 Merge pull request #24932 from thaJeztah/change-to-camelBack-for-consistency
Change "rotate_worker_token" to "rotateWorkerToken"
Upstream-commit: 3742557ed49048befea88125df781d5c87131e0d
Component: engine
2016-07-24 10:05:07 +02:00
9afbc46586 Merge pull request #24960 from aaronlehmann/update-parallelism-docs
Update --update-parallelism docs
Upstream-commit: 8e8580c68059bbe7a2c543fc48420c4ed8763350
Component: engine
2016-07-23 10:35:34 +02:00
0744d6df7d Update --update-parallelism docs
Update documentation to account for the changes in #24952.

docs/swarm/swarm-tutorial/rolling-update.md doesn't need any changes,
but the CLI reference pages should show the current help text.
drain-node.md no longer needs to specify --update-parallelism 1 in its
example.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 933ba8d7f7f95ad0bac97c39ffb3cdf1a5634cc6
Component: engine
2016-07-22 19:07:10 -07:00
48d89793f8 Remove "secrets" leftovers from docs
f5e1f6f6880391a5a3399023cf93a3c48502e57d replaced "secrets"
with "join tokens", which also removed the "auto-accept"
policy.

This removes some remaining references to those features.

Note that there are other references, but those
are already addressed in another pull request.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 987511712f0cee391c8296b7f789c71e91561773
Component: engine
2016-07-23 01:28:20 +02:00
411f901924 Change "rotate_worker_token" to "rotateWorkerToken"
This renames the `rotate_xxx` flags to camelBack, for
consistency with other API query-params, such as
`detachKeys`, `noOverwriteDirNonDir`, and `fromImage`.

Also makes this flag accept a wider range of boolean
values ("0", "1", "true", "false"), and throw an error
if an invalid value is passed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bd81df12780b0765e55582574eaa2a125adf65fa
Component: engine
2016-07-23 01:04:12 +02:00
1ec535a2d9 Append --registry-auth with with
`--with-registry-auth` is more explicit.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8426f72107f351b769babadeabbf13f205126514
Component: engine
2016-07-22 10:38:56 +02:00
79e3f2c256 Merge pull request #24823 from aaronlehmann/join-tokens
Replace secrets with join tokens
Upstream-commit: f5e1f6f6880391a5a3399023cf93a3c48502e57d
Component: engine
2016-07-21 18:06:55 -07:00
b141a44de0 Replace secrets with join tokens
Implement the proposal from
https://github.com/docker/docker/issues/24430#issuecomment-233100121

Removes acceptance policy and secret in favor of an automatically
generated join token that combines the secret, CA hash, and
manager/worker role into a single opaque string.

Adds a docker swarm join-token subcommand to inspect and rotate the
tokens.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 2cc5bd33eef038bf5721582e2410ba459bb656e9
Component: engine
2016-07-21 15:23:03 -07:00
cafdfcad31 Merge pull request #24871 from thaJeztah/fix-wrong-case-mount-type
Change mount-types to lowercase
Upstream-commit: 0a8a6f2dd7850cc467244ba254d5e20555df99dc
Component: engine
2016-07-22 00:03:55 +02:00
bf34d0960f Merge pull request #24892 from thaJeztah/fix-label-formatting-example
docs: improve formatting and highlighting of docker ps reference
Upstream-commit: 2debfe84354d306236b576a0fde665f9af5e0994
Component: engine
2016-07-21 12:38:45 +02:00
5614c24f22 Merge pull request #24700 from nishanttotla/pass-registry-auth-on-deploy
Send registry auth token for service deploy
Upstream-commit: 22d020276cfd6df3482523bc680c775d6a0c57ca
Component: engine
2016-07-21 12:33:33 +02:00
5dc34c3c66 docs: improve formatting and highlighting of docker ps reference
this improves the formatting, and code-highlighting
of the `docker ps` reference page, and wraps sentences
to 80 chars

also adds single quotes around the formatting
example for labels.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 07ef0a37f85fbb3ba0be4a09bb301108bf461d96
Component: engine
2016-07-21 12:27:39 +02:00
acb2cc6fda Change mount-types to lowercase
these values were changed to lowercase in
690cb2d08c,
but not changed accordingly in docker/docker.

this changes the mounttypes to lowercase

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 8f93128cd619e1d11be1bc0ae21f1362b1e3f9ad
Component: engine
2016-07-21 11:25:42 +02:00
cc9d201773 Clarify API behavior when older versions are called.
Signed-off-by: fonglh <fonglh@gmail.com>
Upstream-commit: f62e24f697dd5c69e58f3b5d732fd5a962a0c8e6
Component: engine
2016-07-21 16:16:46 +08:00
c6f6695f3d Merge pull request #24866 from thaJeztah/fix-sloppy-copy-pasta
docs: fix copy/pasta error
Upstream-commit: ccd0d83344da3b4c67708465f11aa542601b6407
Component: engine
2016-07-21 02:02:28 +02:00
2332ccb8c3 Send registry auth token for service deploy
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: a26bdd8607c62e6e736d06e9ec8f0908c4808d74
Component: engine
2016-07-20 16:07:07 -07:00
0d2e409cad Merge pull request #24842 from thaJeztah/fix-code-highlight
docs: add code-hints to builder page
Upstream-commit: 8c6c1aaf07277ea09f65d79337152ba0c9833d4c
Component: engine
2016-07-21 00:06:52 +02:00
1af7b06c9a docs: fix copy/pasta error
Looks like I copied from the line below, not
from the output :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 83b12c0c1144dc3778177fab8dc5052108388f1e
Component: engine
2016-07-20 23:59:38 +02:00
41aabc22f9 Merge pull request #24838 from thaJeztah/add-log-options-to-docs
Add missing --log-driver and --log-opt docs
Upstream-commit: eefc17bba10c90abfc05b26a457f99e30e9b4312
Component: engine
2016-07-20 23:50:10 +02:00
c39d6f825c docs: update reference docs for plugins
the output/response slightly changed in
340964db1c8f161a2ad156023eb47dcc93bf804b,
and `:latest` is no longer required for
various actions.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9d532b5e2d4e68888e38ad2793d9075815e230f7
Component: engine
2016-07-20 23:37:55 +02:00
066ad77538 docs: add initial reference for "stack services"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f49dc528ed29e6285c24ef356652cc8bc637c8c7
Component: engine
2016-07-20 18:56:49 +02:00
00ad3eae23 Merge pull request #24841 from thaJeztah/rename-bundle-flag
[RFC] Rename --bundle to --file
Upstream-commit: b9c49598825529a165e2fead7eae70c3442af7ba
Component: engine
2016-07-20 15:50:54 +00:00
304d95b4ec docs: add code-hints to builder page
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b5503ef0a511f5be11d9dcfa1359976f159d8a67
Component: engine
2016-07-20 16:18:44 +02:00
76dae42c92 Rename --bundle to --file
This renames the '--bundle' flag for docker (stack) deploy
to be consistent with 'docker build'.

Note that there's no shorthand '-f' added for now,
because this may be confusing on 'docker stack config',
which also takes a file, and for which we may want to
have a '--format' flag in future.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 06f35262c47629fef78e36daaa2742c2c0d7c3a9
Component: engine
2016-07-20 16:03:27 +02:00
b84c583f35 fix duplicated usage in docs
this removes a copy/pasta whoopsie on my side,
introduced in de64324109d2694b1525e62b5c0072267282a36c

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: effbd2b76decd00444d963e10eabe2766bb8c89c
Component: engine
2016-07-20 15:36:02 +02:00
b7425fb465 Add missing --log-driver and --log-opt docs
Adds documentation for "--log-driver" and "--log-opt"
for services.

Also updated the API docs to include the new
options, and generated a more complete JSON
example.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5ece2a6e0d748fe3960a7459b745ceb4302e9202
Component: engine
2016-07-20 14:55:26 +02:00
a5f27f2a75 Merge pull request #24507 from sfsmithcha/doc_node_labels
add ref docs for node label
Upstream-commit: 724c69f060ccf21088843ff00c3a8ba4dd966da8
Component: engine
2016-07-20 00:46:51 +02:00
d263002db2 add ref docs for node label
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 9594ac97ce0c6e0777716be2a35b47208d440e8e
Component: engine
2016-07-19 15:41:00 -07:00
918c17adbd Add documentation for stack commands
Also removes the `-f` flags of bundle to follow the single-letter flags
evaluation.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 10919e890942cbdaa65f180dbcd475d21b9c6713
Component: engine
2016-07-19 18:32:44 +02:00
793c74560e Merge pull request #24747 from thaJeztah/bump-golang-to-1.6.3
Bump Go to 1.6.3
Upstream-commit: cf8f2a5037d2795cbcd21eb095ace66bbd9b1c93
Component: engine
2016-07-19 09:42:25 +02:00
5da3c90cb2 Support node label update.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: e1165cdfd1d666b1d4e041ef6a0d5fd049e041c1
Component: engine
2016-07-18 18:39:52 -07:00
b9565b1842 bump Go to 1.6.3
following the announcement;
https://groups.google.com/forum/m/#!topic/golang-announce/7JTsd70ZAT0

> [security] Go 1.6.3 and Go 1.7rc2 pre-announcement
>
> Hello gophers,
> We plan to issue Go 1.6.3 and Go 1.7rc2 on Monday July 18 at approximately 2am UTC.
> These are minor release to fix a security issue.
>
> Following our policy at https://golang.org/security, this is the pre-announcement of those releases.
>
> Because we are so late in the release cycle for Go 1.7, we will not issue a minor release of Go 1.5.
> Additionally, we plan to issue Go 1.7rc3 later next week, which will include any changes between 1.7rc1 and tip.
>
> Cheers,
> Chris on behalf of the Go team

**Note:**
the man/Dockerfile is not yet updated, because
the official image for Go 1.6.2 has not yet
been updated.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 589bafddf391cbf6aff8b22044266dc819cdcaeb
Component: engine
2016-07-18 23:15:03 +02:00
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
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
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
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
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