Commit Graph

2482 Commits

Author SHA1 Message Date
Daniel Nephin a7550e9e70 Support filtering networks by id or name.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-21 14:23:26 -04:00
Alexandre Beslic 50671ab6f3 Integration test for regression with parallel docker run when specifying a port
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-10-21 02:59:04 -07:00
Alexandre Beslic 93e78ce641 Merge pull request #1314 from aluzzardi/fix-nullptr-pendingcontainer
Fix nullptr panic in pending containers.
2015-10-20 12:14:06 -07:00
Chanwit Kaewkasi e64c5ee209 Merge pull request #1309 from vieux/improve_networks
small improvment on network UX
2015-10-20 17:12:38 +07:00
Alexandre Beslic 6ee3420542 Merge pull request #1315 from aluzzardi/golint-fix
Fix various golint issues.
2015-10-19 14:18:36 -07:00
Andrea Luzzardi 58558f5224 Fix various golint issues.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-19 13:58:21 -07:00
Andrea Luzzardi 31cba69ac6 Merge pull request #1313 from denverdino/origin-master
Fix the problem for the orders of filters
2015-10-19 13:56:49 -07:00
Andrea Luzzardi 0399a3c60b Fix nullptr panic in pending containers.
Fixes #1289

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-19 13:38:06 -07:00
Victor Vieux 2c2aa91f9f fix test Dockerfile, use precompiled go
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-19 09:55:27 -07:00
Li Yi 135bee98c9 Fix the problem for the orders of filters
Change-Id: I2dd652a1881cdaaff16e02f26c9f69f5df16419f
Signed-off-by: Li Yi <denverdino@gmail.com>
2015-10-19 23:07:20 +08:00
Victor Vieux 21d6fc5378 fix panic when createContainer returns nil,nil
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-18 21:22:59 -07:00
Victor Vieux 10d232fe66 fix issue with timeouts in mesos
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-18 14:39:16 -07:00
Victor Vieux a2a8596238 improve error message in mesos
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-18 10:41:02 -07:00
Victor Vieux 6643894063 rename `POST /volumes` to `POST /volumes/create`
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-17 23:50:50 -07:00
Victor Vieux f9807f561c fix golint
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-17 01:32:44 -07:00
Victor Vieux 07a102adc8 fix tests
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-10-19 15:46:38 -07:00
Victor Vieux 4e1ae773e2 improve docker network ls and rm
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-10-19 15:42:56 -07:00
Victor Vieux e9c486b046 refresh networks on whole cluster after create and rm
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-10-19 15:42:56 -07:00
Chanwit Kaewkasi 894d1abd63 Merge pull request #1308 from pdevine/errorstrs
Add error messages when pulling/loading images
2015-10-17 07:42:39 +07:00
Victor Vieux e22431bcb2 Merge pull request #1305 from cpuguy83/1297_fix_stuck_on_stdin_tls
Fix issue where conn is stuck waiting for stdin
2015-10-16 17:41:18 -07:00
Victor Vieux 38f5831d07 Merge pull request #1294 from vieux/update_logo
update swarm logo
2015-10-16 15:05:28 -07:00
Patrick Devine fe73803861 Add error messages when pulling/loading images
This change adds error strings when there is an error while pulling or
loading an image.

Signed-off-by: Patrick Devine <patrick.devine@docker.com>
2015-10-16 14:58:07 -07:00
Brian Goff d7cb8baf09 Fix issue where conn is stuck waiting for stdin
This was hard to repro, but found out it seems to only happen with TLS
connections.
When `docker run -i` was set, the client gets stuck waiting for sdin on
exit, and requires hitting return twice.

This fix ensures that:
1. When stdin is done, wait for stdout always
2. When stdout is done, close the stream and wait for stdin to finish

On 2, stdin copy should return immediately now since the out stream is closed.
Note that we probably don't actually even need to wait here.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-10-16 15:16:25 -04:00
Victor Vieux 4d13ce89f8 Merge pull request #1303 from abronan/fix_zk_tests_timing
Integration: Fix timing issue on zookeeper failure test
2015-10-15 16:46:17 -07:00
Victor Vieux 384c29163a Merge pull request #1299 from dnephin/use_parse_repo_tags
Use ParseRepositoryTag() from engine
2015-10-15 16:43:11 -07:00
Victor Vieux bef2892cee Merge pull request #1271 from jimmyxian/fix-reschedule-with-soft-affinity
Do not try retry with soft-image-affinity when have node constraint
2015-10-15 13:52:29 -07:00
Daniel Nephin 910fec887d Use ParseRepositoryTags from engine.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-15 12:30:07 -04:00
Daniel Nephin f69f0e41d4 Add github.com/docker/docker/pkg/parsers/
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-15 12:30:07 -04:00
Alexandre Beslic 755e68b5cf Fix timing issue on zookeeper failure test
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-10-15 08:52:00 -07:00
Andrea Luzzardi 8c4010cc74 Merge pull request #1295 from vieux/remove_authors
remove section readme
2015-10-14 16:36:25 -07:00
Victor Vieux 5d43f2edd3 Merge pull request #1249 from vieux/remove_beta
remove BETA from docs
2015-10-14 15:37:54 -07:00
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