Commit Graph

1053 Commits

Author SHA1 Message Date
Vincent Demeester
4031d70d1b Add container labels to service create/update
Swarm mode makes it possible through the API to set labels to containers
but not through command line. This tries to fix it.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-25 18:57:02 -07:00
Tibor Vass
91e9f38313 healthcheck: do not interpret exit code 2 as "starting"
Instead reserve exit code 2 to be future proof, document that it should
not be used. Implementation-wise, it is considered as unhealthy, but
users should not rely on this as it may change in the future.

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 14:28:45 -07:00
Tibor Vass
c65925f24b Merge pull request #24943 from aaronlehmann/rolling-updates
Add failure action for rolling updates
2016-07-25 10:15:28 -07:00
Sebastiaan van Stijn
1315573093 Merge pull request #25012 from aanand/entrypoint-note
Add note about --entrypoint overriding default command
2016-07-25 19:11:24 +02:00
Aanand Prasad
2b7548f972 Add note about --entrypoint overriding default command
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-25 17:21:23 +01:00
Aaron Lehmann
57ae29aa74 Add failure action for rolling updates
This changes the default behavior so that rolling updates will not
proceed once an updated task fails to start, or stops running during the
update. Users can use docker service inspect --pretty servicename to see
the update status, and if it pauses due to a failure, it will explain
that the update is paused, and show the task ID that caused it to pause.
It also shows the time since the update started.

A new --update-on-failure=(pause|continue) flag selects the
behavior. Pause means the update stops once a task fails, continue means
the old behavior of continuing the update anyway.

In the future this will be extended with additional behaviors like
automatic rollback, and flags controlling parameters like how many tasks
need to fail for the update to stop proceeding. This is a minimal
solution for 1.12.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-25 08:51:19 -07:00
Sebastiaan van Stijn
b0089e4827 Add new error to API docs
Commit cc493a52a4 added
a constraint to network connect/disconnect operations
on "Swarm scoped" networks.

This adds those errors to the API documentation. Also
changes the error to lowercase for consistency.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-25 12:04:55 +02:00
Aaron Lehmann
fca0b18dcb 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>
2016-07-24 09:23:38 -07:00
Aaron Lehmann
a0ccd0d42f 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>
2016-07-24 09:23:07 -07:00
Vincent Demeester
180f8c61bb Update swarm init task-history-limit docs
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-24 11:13:06 +02:00
Vincent Demeester
3742557ed4 Merge pull request #24932 from thaJeztah/change-to-camelBack-for-consistency
Change "rotate_worker_token" to "rotateWorkerToken"
2016-07-24 10:05:07 +02:00
Sebastiaan van Stijn
8e8580c680 Merge pull request #24960 from aaronlehmann/update-parallelism-docs
Update --update-parallelism docs
2016-07-23 10:35:34 +02:00
Aaron Lehmann
933ba8d7f7 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>
2016-07-22 19:07:10 -07:00
Sebastiaan van Stijn
987511712f Remove "secrets" leftovers from docs
f5e1f6f688 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>
2016-07-23 01:28:20 +02:00
Sebastiaan van Stijn
bd81df1278 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>
2016-07-23 01:04:12 +02:00
Vincent Demeester
8426f72107 Append --registry-auth with with
`--with-registry-auth` is more explicit.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-22 10:38:56 +02:00
Tibor Vass
f5e1f6f688 Merge pull request #24823 from aaronlehmann/join-tokens
Replace secrets with join tokens
2016-07-21 18:06:55 -07:00
Aaron Lehmann
2cc5bd33ee 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>
2016-07-21 15:23:03 -07:00
Sebastiaan van Stijn
0a8a6f2dd7 Merge pull request #24871 from thaJeztah/fix-wrong-case-mount-type
Change mount-types to lowercase
2016-07-22 00:03:55 +02:00
Sebastiaan van Stijn
2debfe8435 Merge pull request #24892 from thaJeztah/fix-label-formatting-example
docs: improve formatting and highlighting of docker ps reference
2016-07-21 12:38:45 +02:00
Vincent Demeester
22d020276c Merge pull request #24700 from nishanttotla/pass-registry-auth-on-deploy
Send registry auth token for service deploy
2016-07-21 12:33:33 +02:00
Sebastiaan van Stijn
07ef0a37f8 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>
2016-07-21 12:27:39 +02:00
Sebastiaan van Stijn
8f93128cd6 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>
2016-07-21 11:25:42 +02:00
fonglh
f62e24f697 Clarify API behavior when older versions are called.
Signed-off-by: fonglh <fonglh@gmail.com>
2016-07-21 16:16:46 +08:00
Sebastiaan van Stijn
ccd0d83344 Merge pull request #24866 from thaJeztah/fix-sloppy-copy-pasta
docs: fix copy/pasta error
2016-07-21 02:02:28 +02:00
Nishant Totla
a26bdd8607 Send registry auth token for service deploy
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-07-20 16:07:07 -07:00
Sebastiaan van Stijn
8c6c1aaf07 Merge pull request #24842 from thaJeztah/fix-code-highlight
docs: add code-hints to builder page
2016-07-21 00:06:52 +02:00
Sebastiaan van Stijn
83b12c0c11 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>
2016-07-20 23:59:38 +02:00
Sebastiaan van Stijn
eefc17bba1 Merge pull request #24838 from thaJeztah/add-log-options-to-docs
Add missing --log-driver and --log-opt docs
2016-07-20 23:50:10 +02:00
Sebastiaan van Stijn
9d532b5e2d docs: update reference docs for plugins
the output/response slightly changed in
340964db1c,
and `:latest` is no longer required for
various actions.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-20 23:37:55 +02:00
Sebastiaan van Stijn
f49dc528ed docs: add initial reference for "stack services"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-20 18:56:49 +02:00
Arnaud Porterie
b9c4959882 Merge pull request #24841 from thaJeztah/rename-bundle-flag
[RFC] Rename --bundle to --file
2016-07-20 15:50:54 +00:00
Sebastiaan van Stijn
b5503ef0a5 docs: add code-hints to builder page
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-20 16:18:44 +02:00
Sebastiaan van Stijn
06f35262c4 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>
2016-07-20 16:03:27 +02:00
Sebastiaan van Stijn
effbd2b76d fix duplicated usage in docs
this removes a copy/pasta whoopsie on my side,
introduced in de64324109

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-20 15:36:02 +02:00
Sebastiaan van Stijn
5ece2a6e0d 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>
2016-07-20 14:55:26 +02:00
Sebastiaan van Stijn
724c69f060 Merge pull request #24507 from sfsmithcha/doc_node_labels
add ref docs for node label
2016-07-20 00:46:51 +02:00
Charles Smith
9594ac97ce add ref docs for node label
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-07-19 15:41:00 -07:00
Vincent Demeester
10919e8909 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>
2016-07-19 18:32:44 +02:00
Vincent Demeester
cf8f2a5037 Merge pull request #24747 from thaJeztah/bump-golang-to-1.6.3
Bump Go to 1.6.3
2016-07-19 09:42:25 +02:00
Dong Chen
e1165cdfd1 Support node label update.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-07-18 18:39:52 -07:00
Sebastiaan van Stijn
589bafddf3 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>
2016-07-18 23:15:03 +02:00
Arnaud Porterie
de64324109 Merge pull request #24705 from thaJeztah/update-flag-descriptions
Improve flag help consistency, and update docs
2016-07-18 16:07:23 +00:00
Arnaud Porterie
98a4b3e332 Merge pull request #24714 from allencloud/better-docker-network-create-help-output
better command `docker network create -h` output
2016-07-18 16:05:46 +00:00
Yanqiang Miao
f9ef10f853 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>
2016-07-19 02:53:03 +08:00
Yong Tang
0159ee1f5d 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>
2016-07-17 16:45:09 -07:00
allencloud
d0081a0f47 better command docker network create -h output
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-16 15:32:17 +08:00
Sebastiaan van Stijn
64a8317a5a 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>
2016-07-16 01:58:01 +02:00
Justin Cormack
6ba6265d1a 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>
2016-07-15 14:11:54 +01:00
Qiang Huang
92dfbc1e2d Fix aufs docs
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-07-15 13:57:38 +08:00