Commit Graph

5616 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
42f2205184 Merge pull request #23844 from tjanez/docs-systemd-expand
Expand instructions on using systemd to manage containers
2016-07-25 14:39:45 +02:00
Sebastiaan van Stijn
4b94a6cb16 Merge pull request #24991 from everett-toews/fix-AuthzPlugin
Fix AuthzPlugin URL fragment in docs
2016-07-25 10:32:03 +02:00
Vincent Demeester
40044cb18f Merge pull request #24963 from allencloud/fix-typos
fix typos
2016-07-25 09:39:48 +02:00
Everett Toews
c42fbc6b09 Fix AuthzPlugin URL fragment in docs
These docs have AuthzPlugin with a lower case 'z'. What the plugin
api is actually looking for is AuthZPlugin with an upper case 'Z'.

See 46e3a249a1/pkg/authorization/api.go (L5-L8)

Signed-off-by: Everett Toews <everett.toews@rackspace.com>
2016-07-24 23:03:19 -05: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
allencloud
4e959ef2f7 fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-23 11:32:23 +08: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
Sebastiaan van Stijn
85fdac6e8c Merge pull request #24907 from sfsmithcha/update_tutorial_swarm_token
updates get started with swarm to use join-token
2016-07-22 19:15:41 +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
Charles Smith
9ac145d736 updates get started with swarm to use join-token
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-07-21 19:53:54 -07: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
8cbe6541b2 Merge pull request #24572 from yongtang/24534-deprecation-cycle-3-releases
Extend deprecation cycle to 3 releases by default
2016-07-21 21:06:57 +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
Vincent Demeester
81ef36c980 Merge pull request #24820 from sfsmithcha/add_how_swarm_works_guide
add how nodes work to how swarm works guide
2016-07-20 22:08:31 +02:00
Charles Smith
137261f97c add how nodes work to how swarm works guide
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-07-20 12:37:38 -07:00
Sebastiaan van Stijn
a9ca19feaa Merge pull request #24523 from sfsmithcha/clarify_rolling_update
clarify update-delay and rolling update behavior
2016-07-20 20:24:18 +02:00
Charles Smith
68a9224bd4 clarify update-delay and rolling update behavior
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-07-20 10:11:04 -07: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
d6d02f652c Merge pull request #24843 from resouer/fix-nits
Fix nits in deprecated
2016-07-20 16:32:47 +02: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
Brian Goff
2ee828aac2 Merge pull request #24802 from vdemeester/stack-docs-and-flags
Add documentation for stack commands
2016-07-19 14:30:49 -04:00
Tibor Vass
39327a67e8 Merge pull request #24804 from crosbymichael/rpm-socket
Remove docker.socket from rpm based systems
2016-07-19 11:18:22 -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
Michael Crosby
04104c3a1e Remove docker.socket from rpm based systems
Fixes #23981

The selinux issue we are seeing in the report is related to the socket
file for docker and nothing else. By removing the socket docker starts
up correctly.

However, there is another motivation for removing socket activation from
docker's systemd files and that is because when you have daemons running
with --restart always whenever you have a host reboot those daemons
will not be started again because the docker daemon is not started by
systemd until a request comes into the docker API.

Leave it for deb based systems because everything is working correctly
for both socket activation and starting normally at boot.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-07-19 09:31:43 -07:00
Harry Zhang
78a5480dfd Fix nits in deprecated
Signed-off-by: Harry Zhang <harryz@hyper.sh>
2016-07-19 22:42:23 +08: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