docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,384 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

2384 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 cf83f1dc78 Merge pull request #1277 from mijia/rename_event 
Engine should refresh the container on container rename event
 2015-10-12 12:13:15 -07:00
Victor Vieux 2a46e2d3ab Merge pull request #1278 from jimmyxian/fix-rename-test 
Fix rename test
 2015-10-11 15:07:54 -07:00
Xian Chaobo f6134de8c6 fix rename test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-10-10 16:55:52 +08:00
Jia Mi 660299f749 Engine should refresh the container on container rename event 
Signed-off-by: Jia Mi <winters.mi@gmail.com>
 2015-10-10 15:17:48 +08:00
Victor Vieux ea65dd9925 Merge pull request #1264 from abronan/fix_watch_init 
Initialize the key/directory before watching on kv discovery
 2015-10-09 15:55:28 -07:00
Andrea Luzzardi b2b32d979d scheduler now returns the list of ranked nodes rather than the top node. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-10-09 15:32:37 -07:00
Victor Vieux 267d7e6701 Merge pull request #1261 from aluzzardi/parallel-scheduling 
Parallel scheduling
 2015-10-09 12:57:42 -07:00
Andrea Luzzardi 7c0539c650 cluster: Fix name setting of pending containers. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-10-09 12:54:57 -07:00
Andrea Luzzardi 24394612f5 cluster: Don't lock the scheduler when removing a container. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-10-09 12:54:56 -07:00
Andrea Luzzardi 91279c8256 cluster: Check name uniqueness among pending containers. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-10-09 12:54:56 -07:00
Andrea Luzzardi c64ae5168a Parallel scheduling support for Swarm driver. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-10-09 12:54:53 -07:00
Victor Vieux 3a79038d48 Merge pull request #1268 from aluzzardi/refresh-loop-cleanup 
engine cleanup: Don't mess with the global random.
 2015-10-09 12:52:39 -07:00
Andrea Luzzardi cb2ceea702 engine: Added a concurrent safe refresh delayer. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-10-09 11:32:03 -07:00
moxiegirl 96e0966afc Merge pull request #1274 from pwnall/patch-2 
Document CpuShares special handling in Swarm
 2015-10-09 06:11:14 -07:00
Victor Vieux ca9a234f03 add some docs 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-10-09 00:26:51 -07:00
Victor Vieux df5c394308 add store test 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-10-08 22:36:13 -07:00
Victor Vieux 587d535188 add support docker connect / disconnect 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-10-08 22:36:13 -07:00
Victor Vieux e5eeec580c use overlay as default in swarm 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-10-08 22:36:13 -07:00
Victor Vieux 78ecf8497c Add network rm 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-10-08 22:36:13 -07:00
Victor Vieux b007cae8b2 Add docker network create 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-10-08 22:35:07 -07:00
Victor Vieux 8559fb0fc6 remove cluster.Network(IDOrName) 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-10-08 22:35:07 -07:00
Victor Vieux 12c2d46dd5 prepend engine name on network name 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-10-08 22:35:07 -07:00
Victor Vieux e634df03a7 add 'docker network ls' support 
add 'docker network inspect' suport

Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-10-08 22:35:07 -07:00
Alexandre Beslic 5f807caef1 Merge pull request #1252 from vieux/fix_detach_exec 
fix exec -d
 2015-10-08 18:32:07 -07:00
Victor Vieux bea2538cb5 Merge pull request #1275 from vieux/fix_volume_tests 
fix volume tests with the last docker engine
 2015-10-08 18:14:46 -07:00
Victor Vieux 793461daff fix volume tests with the last docker engine 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-10-08 18:14:32 -07:00
Victor Vieux b863c728d2 Merge pull request #1270 from jimmyxian/fix-soft-filter 
Fix soft filter
 2015-10-08 16:20:32 -07:00
Victor Costan aaf52189dc Document CpuShares special handling in Swarm 
The difference is currently only documented in the issue below.
https://github.com/docker/swarm/issues/475

The diff in the PR below highlights the special handling of CpuShares.
https://github.com/docker/swarm/pull/904/files

Signed-off-by: Victor Costan <costan@gmail.com>
 2015-10-08 19:05:06 -04:00
Alexandre Beslic ab249c4756 Fix tests by adding mocks for additional Watch calls 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-10-08 11:20:04 -07:00
Xian Chaobo c6fb10cec3 fix soft filter 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-10-08 05:16:19 -04:00
Xian Chaobo 315ddfeb4d do not try retry with soft-image-affinity when have node constraint 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-10-08 05:06:39 -04:00
Victor Vieux 03714f66d1 Merge pull request #1266 from vieux/fix_container_matching 
Fix container matching
 2015-10-07 17:47:25 -07:00
Andrea Luzzardi f1782fed90 engine cleanup: Don't mess with the global random. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-10-07 17:27:41 -07:00
Victor Vieux f5925f5a1c Fix container matching 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-10-07 14:18:35 -07:00
Andrea Luzzardi 394ae84a49 node: Use cluster.Containers instead of duplicating code 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-10-07 13:08:19 -07:00
Victor Vieux fe655270b9 Merge pull request #1263 from aluzzardi/refresh-loop 
engine: More robust refresh loop.
 2015-10-07 11:29:02 -07:00
Andrea Luzzardi 13483451da engine: More robust refresh loop. 
- Random heartbeat (between 30 and 60 seconds).
- Requires 3 failures before marking a node as dead.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-10-06 19:39:39 -07:00
Alexandre Beslic fa5cd27d82 Initialize the key/directory before watching on kv discovery 
Before that change, etcd and zookeeper would fail to instantiate
the discovery without the key being already there in the store or
created beforehand and implicitely by a 'swarm join'.

Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-10-06 17:12:16 -07:00
Victor Vieux 94d2375919 Merge pull request #1258 from abronan/change_replication_ttl_flag 
Replace --leaderTTL flag by --replication-ttl
 2015-10-06 14:09:15 -07:00
Victor Vieux 15fbd17b7e Merge pull request #1260 from abronan/update_libkv_godeps 
Update libkv Godeps with migration to the new etcd client
 2015-10-06 14:09:07 -07:00
Alexandre Beslic 9521a1a964 Update etcd image in integration tests to 2.2.0 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-10-05 09:02:37 -07:00
Alexandre Beslic 1c0d40365b Update libkv godeps with migration to the new etcd client 
As 'go-etcd' was deprecated not long ago, this commit vendors
the latest changes to 'libkv', including support for the new
'coreos/etcd/client'.

Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-10-05 08:59:32 -07:00
Andrea Luzzardi 581704dd11 Merge pull request #1248 from dnephin/fix_label_ignored_by_ps 
Support filtering images by labels
 2015-10-02 13:49:19 -07:00
Daniel Nephin 8abf7d32e9 Support filtering images by labels 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-02 15:45:52 -04:00
Victor Vieux a315803cf9 Merge pull request #1253 from raoofm/master 
doc: spell check swarm in discovery readme
 2015-10-02 11:47:02 -07:00
Raoof Mohammed 52a184c1db doc: spell check swarm in discovery readme 
Signed-off-by: Raoof Mohammed <raoof.md@gmail.com>
 2015-10-02 13:29:25 -04: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
Daniel Nephin 5afc1e4924 Update samalba/dockerclient dependency. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-01 15:49:29 -04:00
Victor Vieux 26785556fa fix exec -d 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-10-01 07:29:38 -07:00