centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-01 00:38:52 +07:00
Code Issues Packages Projects Releases Wiki Activity
2,219 Commits 54 Branches 28 Tags
8a2897e141f0fea20beb9bdebfc6bb287c31aad2
Commit Graph

48 Commits

Author SHA1 Message Date
Daniel Hiltgen
3661b6e63b Add TLS support for libkv 
This adds TLS support into the KV store for swarm.  The manage, join,
and list commands all have a new CLI argument, matching the docker engine
discovery backend.  This required adding the tlsconfig utility
package from docker engine.

Here's an example showing re-use of the cluster certs for the KV store:

    swarm manage --tlsverify \
        --tlscacert /etc/docker/ssl/ca.pem
        --tlscert /etc/docker/ssl/cert.pem
        --tlskey /etc/docker/ssl/key.pem
        --discovery-opt kv.cacertfile=/etc/docker/ssl/ca.pem
        --discovery-opt kv.certfile=/etc/docker/ssl/cert.pem
        --discovery-opt kv.keyfile=/etc/docker/ssl/key.pem
        --advertise 192.168.122.47:3376
        etcd://192.168.122.47:2379

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
 2015-10-12 13:33:08 -07:00
Alexandre Beslic
c74cf900ef Replace --leaderTTL flag by --replication-ttl 
Fixes #1256

Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-10-02 08:42:14 -07:00
Alexandre Beslic
ab8d1b489c add support for specifying the leader election lock ttl 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-09-23 04:06:35 -07:00
Morgan Bauer
5c4b0a1765 remove deprecated unused flag 
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-09-09 16:22:53 -07:00
Alexandre Beslic
6c1c83f7a3 Cleanup state folder with local file persistence (not used anymore) 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-08-30 17:15:52 -07:00
Victor Vieux
28bc55ed6b improve usage for discovery 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-08-01 16:53:07 -07:00
Alexandre Beslic
c7513506be Fault tolerant Leader Election process, fixes leader information on docker info, fixes intermittent error on Consul session lock 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-07-31 10:06:47 -07:00
Andrea Luzzardi
f38c034499 Leader Election: Use same path prefix as discovery. 
Fixes #1037

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-07-09 01:16:47 -07:00
Victor Vieux
895d820774 Merge pull request #964 from jimenez/task_timeout_flag 
making task timeout configurable
 2015-07-01 16:51:33 -07:00
Isabel Jimenez
305050025c making task timeout configurable 
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
 2015-07-01 18:58:17 -04:00
Victor Vieux
ec9c970643 update usage 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-15 14:02:30 -07:00
Andrea Luzzardi
10ba572658 API: Cleanup router/proxy. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-06-11 20:41:27 -07:00
Andrea Luzzardi
d63de2da48 leader election: Display replica status in docker info. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-06-11 18:56:02 -07:00
Andrea Luzzardi
1ba543215e cli: Cleanup the CLI package. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-27 18:41:02 -07:00
Alexandre Beslic
23f66f8cc6 Merge pull request #858 from aluzzardi/addr-flag 
Replace --addr with --advertise
 2015-05-27 11:44:41 -07:00
Isabel Jimenez
ebbeeba070 Update manage.go 
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
 2015-05-26 21:06:12 -04:00
Andrea Luzzardi
ad6fac53db fix --addr backward compatibility 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-26 17:48:54 -07:00
Andrea Luzzardi
7394be0704 Replace --addr with --advertise 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-26 17:43:14 -07:00
Victor Vieux
9ff9bd16ae add warning and rename flag 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-26 17:03:08 -07:00
Isabel Jimenez
db7d918c0a Addressing review comments 
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
 2015-05-26 19:45:10 -04:00
Isabel Jimenez
920897defb disable mesos in the cli 
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
 2015-05-26 16:23:08 -04:00
Victor Vieux
300932b2d5 add slave_test.go, add tast_test.go 
add basic network mode support

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
Signed-off-by: Timothy Chen <tnachen@gmail.com>
 2015-05-26 16:22:34 -04:00
Isabel Jimenez
19c14fde2e Adding integration tests, decline offers after 'SWARM_MESOS_OFFER_TIMEOUT', Tracking tasks and managing offers, refactoring list of slaves, queue create requests before processing them 
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-05-26 16:21:54 -04:00
Timothy Chen
20a5a7e588 Support port and address for Mesos. 
Signed-off-by: Timothy Chen <tnachen@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
 2015-05-26 16:19:08 -04:00
Isabel Jimenez
18235bee97 cluster mesos with engine 
Signed-off-by: Timothy Chen <tnachen@gmail.com>
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-05-26 16:18:33 -04:00
Andrea Luzzardi
b4efc08dfc api: Integrate leader election. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-22 21:23:34 -07:00
Alexandre Beslic
b8d72c291d Cleanup, fix Integration tests and use of a single global Session in Consul 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-19 15:27:39 -07:00
Alexandre Beslic
4537b9f2ba Remove unused code 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-19 12:57:43 -07:00
Alexandre Beslic
f81de46ab4 Fix Consul and etcd with latest changes, use etcd v2.0.11 for integration tests, remove call to SyncCluster for now (breaks the integration tests) 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-19 10:25:31 -07:00
Victor Vieux
a43f10adc4 update usage to look more like the engine/machine 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-18 13:57:43 -07:00
Andrea Luzzardi
3d6f833f6f fix --heartbeat flag. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:38:15 -07:00
Andrea Luzzardi
7430fe5141 fix hb/timeout being time.Duration in a few places 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:38:14 -07:00
Andrea Luzzardi
0c72bcaf40 discovery cleanup: heartbeat is a time.Duration. 
- Use a time.Duration instead of a uint64 for hb
- Flags can accept durations: --heartbeat 25s

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:38:14 -07:00
Andrea Luzzardi
f33c03af93 discovery: Push watch errors to a channel 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:38:14 -07:00
Andrea Luzzardi
3de0b5f567 join: Don't give up if registration fails, just retry. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:38:14 -07:00
Andrea Luzzardi
97984881c3 discovery: New channel based API. 
- Watch() issues updates by channel rather than by callback
- Fetch() is gone
- Watch() can be stopped at any time by closing the stop channel
- Watch() is now resilient to errors and will try over and over

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:38:13 -07:00
Victor Vieux
59cd11b946 change swarm.heartbeat to swarm.discovery.heartbeat 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-13 15:48:07 -07:00
Victor Vieux
5db3a9cd0e remove options struct, yay! 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-13 15:36:30 -07:00
Victor Vieux
c29404e272 add --cluster-driver and --cluster-opt 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-12 17:49:00 -07:00
Alexandre Beslic
06f51e09b0 revert variable names 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-12 14:47:48 -07:00
Alexandre Beslic
6b0b82cddc Add fixme related to timeout/heartbeat issue 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-12 14:41:09 -07:00
Alexandre Beslic
403f95f86c Remove placeholder TLS parameter in discovery interface and New method 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-12 14:19:30 -07:00
Alexandre Beslic
6f67ca3a58 replace variadic method options for simple Config struct, correct Consul Watch method 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-12 14:00:55 -07:00
Alexandre Beslic
e039563c78 Fix zookeeper timeout value 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-11 18:23:40 -07:00
Alexandre Beslic
59e1e9b942 Change existing discovery backends to 'kv' using metatada storage backends in the store package 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-11 17:23:55 -07:00
Arnaud Porterie
c3903d69f9 Fast exit from create on invalid command-line 
The `create` command now fails immediately when invoked with an invalid
command-line rather than going as far as initializing discovery and
creating a cluster.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-04-28 09:47:06 -07:00
Victor Vieux
57ef27efcc fix consul help 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-04-23 14:41:21 -07:00
Andrea Luzzardi
eebc06aabe Cleanup: Move CLI related files to a subpackage. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-04-18 20:26:55 -07:00