894d1abd63
Merge pull request #1308 from pdevine/errorstrs
...
Add error messages when pulling/loading images
2015-10-17 07:42:39 +07:00
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
38f5831d07
Merge pull request #1294 from vieux/update_logo
...
update swarm logo
2015-10-16 15:05:28 -07:00
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
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
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
384c29163a
Merge pull request #1299 from dnephin/use_parse_repo_tags
...
Use ParseRepositoryTag() from engine
2015-10-15 16:43:11 -07:00
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
910fec887d
Use ParseRepositoryTags from engine.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-15 12:30:07 -04:00
f69f0e41d4
Add github.com/docker/docker/pkg/parsers/
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-15 12:30:07 -04:00
755e68b5cf
Fix timing issue on zookeeper failure test
...
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-10-15 08:52:00 -07:00
8c4010cc74
Merge pull request #1295 from vieux/remove_authors
...
remove section readme
2015-10-14 16:36:25 -07:00
5d43f2edd3
Merge pull request #1249 from vieux/remove_beta
...
remove BETA from docs
2015-10-14 15:37:54 -07:00
c3973b0c01
remove section readme
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-10-14 15:27:17 -07:00
0afed486bb
update swarm logo
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-10-14 15:22:46 -07:00
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
380c3bf828
Bump version to 1.0.0
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-13 17:40:00 -07:00
ecb7eabe4f
Merge pull request #1291 from vieux/update_libnetwork
...
update libnetwork
2015-10-13 17:33:38 -07:00
35c6932d73
Merge pull request #1290 from vieux/remove_store
...
remove unused store test
2015-10-13 17:11:49 -07:00
d000d70238
update libnetwork
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-13 17:06:21 -07:00
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
47d4563124
Merge pull request #1286 from vieux/fix_merge_issue
...
fix merge issue
2015-10-13 12:42:09 -07:00
1e30ce215f
Merge pull request #1262 from vieux/libnetwork
...
add 'docker network' support
2015-10-13 11:09:27 -07:00
2532d1b282
Merge pull request #1283 from MHBauer/docs-started
...
docs additions
2015-10-13 10:50:48 -07:00
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
5cbf0667c8
remove unused store test
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-13 04:15:55 -07:00
6d6927d1de
fix merge issue
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-13 01:24:10 -07:00
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
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
1d008a7ddd
Merge pull request #1254 from dhiltgen/tls_kv
...
Add TLS support for libkv
2015-10-12 14:31:03 -07:00
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
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
2a46e2d3ab
Merge pull request #1278 from jimmyxian/fix-rename-test
...
Fix rename test
2015-10-11 15:07:54 -07:00
f6134de8c6
fix rename test
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-10-10 16:55:52 +08:00
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
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
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
267d7e6701
Merge pull request #1261 from aluzzardi/parallel-scheduling
...
Parallel scheduling
2015-10-09 12:57:42 -07:00
7c0539c650
cluster: Fix name setting of pending containers.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-09 12:54:57 -07:00
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
91279c8256
cluster: Check name uniqueness among pending containers.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-09 12:54:56 -07:00
c64ae5168a
Parallel scheduling support for Swarm driver.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-09 12:54:53 -07:00
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
cb2ceea702
engine: Added a concurrent safe refresh delayer.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-10-09 11:32:03 -07:00
96e0966afc
Merge pull request #1274 from pwnall/patch-2
...
Document CpuShares special handling in Swarm
2015-10-09 06:11:14 -07:00
ca9a234f03
add some docs
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-09 00:26:51 -07:00
df5c394308
add store test
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:36:13 -07:00
587d535188
add support docker connect / disconnect
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:36:13 -07:00
e5eeec580c
use overlay as default in swarm
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:36:13 -07:00
78ecf8497c
Add network rm
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-10-08 22:36:13 -07:00
Chanwit Kaewkasi
Victor Vieux
Patrick Devine
Brian Goff
Daniel Nephin
Alexandre Beslic
Andrea Luzzardi
Victor Vieux
moxiegirl
Xian Chaobo
Morgan Bauer
Daniel Hiltgen
Jia Mi