Commit Graph

2351 Commits

Author SHA1 Message Date
Victor Vieux c3973b0c01 remove section readme
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-10-14 15:27:17 -07:00
Victor Vieux 0afed486bb update swarm logo
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-10-14 15:22:46 -07:00
Andrea Luzzardi fe881898bc Merge pull request #1292 from vieux/bump-1.0.0
Bump version to 1.0.0
2015-10-13 18:14:04 -07:00
Victor Vieux 380c3bf828 Bump version to 1.0.0
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-13 17:40:00 -07:00
Alexandre Beslic ecb7eabe4f Merge pull request #1291 from vieux/update_libnetwork
update libnetwork
2015-10-13 17:33:38 -07:00
Victor Vieux 35c6932d73 Merge pull request #1290 from vieux/remove_store
remove unused store test
2015-10-13 17:11:49 -07:00
Victor Vieux d000d70238 update libnetwork
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-13 17:06:21 -07:00
Victor Vieux 49dc6498c1 Merge pull request #1285 from moxiegirl/retooling-hugo-15
Updating with new tooling that supports GitHub source Markdown
2015-10-13 12:55:53 -07:00
Alexandre Beslic 47d4563124 Merge pull request #1286 from vieux/fix_merge_issue
fix merge issue
2015-10-13 12:42:09 -07:00
Alexandre Beslic 1e30ce215f Merge pull request #1262 from vieux/libnetwork
add 'docker network' support
2015-10-13 11:09:27 -07:00
moxiegirl 2532d1b282 Merge pull request #1283 from MHBauer/docs-started
docs additions
2015-10-13 10:50:48 -07:00
Mary Anthony f1a64ea23a Updating with new tooling that supports GitHub source Markdown
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-13 04:18:50 -07:00
Victor Vieux 5cbf0667c8 remove unused store test
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-13 04:15:55 -07:00
Victor Vieux 6d6927d1de fix merge issue
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-13 01:24:10 -07:00
Xian Chaobo 3fc52aa81d Merge pull request #1276 from aluzzardi/strategy-rankandsort
scheduler: Return a list of candidates rather than a single node.
2015-10-13 09:31:16 +08:00
Morgan Bauer e4edd0bb88
docs additions
- add the unix socket, the default of the docker client
 - partially resolves #804

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-10-12 16:15:40 -07:00
Andrea Luzzardi 1d008a7ddd Merge pull request #1254 from dhiltgen/tls_kv
Add TLS support for libkv
2015-10-12 14:31:03 -07:00
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