Bryan Boreham
bbf26fc3e8
Raise minimum Docker version to 1.6 to address #1683
2015-11-20 10:44:45 +00:00
Bryan Boreham
385b0aa07f
Fix typo in -tls info string
2015-11-20 10:33:20 +00:00
Bryan Boreham
f2b1ee3398
Merge branch 'latest_release_doc_updates' into 1.3
2015-11-20 10:30:28 +00:00
Bryan Boreham
2a2c60201f
Merge pull request #1699 from weaveworks/issues/1693-fix-proxy-docs-tls-args
...
Fix erroneously hyphenated Docker TLS arguments; Fixes #1693 .
LGTM
2015-11-20 10:27:34 +00:00
Matthias Radestock
ee12b34334
eliminate a gossip inefficiency and dormant bug
...
Fixes #1704
2015-11-19 20:57:27 +00:00
Bryan Boreham
f25af8f7d6
Merge pull request #1698 from weaveworks/1697-copy-on-write-gossip-data
...
make GossipData immutable; Fixes #1697 . Fixes #1450 . Fixes #1452 .
2015-11-19 14:58:32 +00:00
Matthias Radestock
1500b1dc00
refactor: extract nameserver GossipData.copy
...
and remove a self-evident comment
2015-11-18 11:30:40 +00:00
Adam Harrison
9263d3e82c
Fix erroneously hyphenated Docker TLS arguments
2015-11-18 10:24:46 +00:00
Adam Harrison
02b7fd53ed
Merge tag 'v1.3.0' into latest_release_doc_updates
...
Resetting doc update branch for 1.3.0 release.
2015-11-18 10:14:10 +00:00
Matthias Radestock
3cd199e852
make GossipData immutable
...
The same piece of GossipData can be shared and subject to different
Merge operations. We either need to copy the data when we share it, or
create copies on modification, i.e. copy-on-write.
We choose the latter, since it is more efficient and there is just one
mutating operation.
Fixes #1697 .
2015-11-17 20:13:46 +00:00
Bryan Boreham
de802f9d76
Work round docker-py assuming busybox is present ( https://github.com/docker/docker-py/issues/852 )
2015-11-13 11:44:08 +00:00
Bryan Boreham
804e6ba586
Cope with changes in docker-py structure.
...
Tests are now in a different directory,
and get sharded by module rather than individually.
2015-11-13 11:08:57 +00:00
Adam Harrison
af3fc82b77
Add release v1.3.0
2015-11-12 16:49:33 +00:00
Adam Harrison
3bb7036cfd
Runner depends on tools
2015-11-12 16:48:56 +00:00
Bryan Boreham
d802eb485b
Merge pull request #1664 from weaveworks/weave-launch-plugin
...
Add plugin support to weave script. LGTM.
2015-11-12 16:04:41 +00:00
Adam Harrison
b4dd9c2490
Add plugin to features doc
2015-11-12 16:01:01 +00:00
Adam Harrison
04ab198e95
Set restart policy to 'always'
...
Docker attempts to recreate networks on startup which means the plugin
container has to be started. If it isn't started automatically by Docker
with a restart policy, it's not possible to start it manually because
Docker is blocked.
2015-11-12 14:58:54 +00:00
Adam Harrison
c345700963
Add plugin to weave status
2015-11-12 14:58:54 +00:00
Adam Harrison
b21afcb78f
Implement weave launch-plugin and weave stop-plugin
2015-11-12 14:56:13 +00:00
Adam Harrison
7f65530b26
weave setup fetches plugin
2015-11-12 14:56:13 +00:00
Bryan Boreham
b1b03f3a97
Revert "Remove code coverage as temporary work-around to Docker 1.9 issue"
...
This reverts commit 65fe753a58
2015-11-12 11:27:48 +00:00
Bryan Boreham
36ef6d8da2
Merge remote-tracking branch 'origin/1.2'
2015-11-12 11:27:01 +00:00
Bryan Boreham
28bb0dd3b0
Merge pull request #1671 from weaveworks/1666-remove-cont-dir
...
Remove containers directory bind-mount from proxy; fixes #1647 and #1666
2015-11-12 11:25:34 +00:00
Bryan Boreham
79f8a8f909
Merge remote-tracking branch 'origin/1.2'
2015-11-12 10:43:01 +00:00
Bryan Boreham
bfe2513540
Merge pull request #1669 from dpw/fdp-fix-npd
...
Handle the case where Forward returns nil. Fixes #1661 .
2015-11-12 10:38:29 +00:00
Bryan Boreham
2536aef737
Proxy doesn't need to mount the containers dir
2015-11-12 10:28:58 +00:00
Adam Harrison
0661ccdea9
Revert "Revert "Disable restart of docker""
...
This reverts commit 76db732f1b
2015-11-11 10:10:17 +00:00
Adam Harrison
29f7015e58
Merge pull request #1665 from weaveworks/move-odp-helpers
...
Move ODP helper functions out to their own package
2015-11-11 09:56:24 +00:00
David Wragg
7dc1b50d3b
Handle the case where Forward returns nil
...
Forward can return nil if the remote peer has HasShortID false. That
can happen if we learn about a 1.2 peer from a 1.1 peer and attempt to
connect to it.
This change just fixes the panic. HasShortID will never be set, so we'll
fall back to sleeve. But if that occurs, if can be fixed by a restart of
the affected routers.
2015-11-10 23:17:01 +00:00
Bryan Boreham
682133a56a
Move ODP helper functions out to their own package
2015-11-10 17:09:17 +00:00
Adam Harrison
76db732f1b
Revert "Disable restart of docker"
...
This reverts commit a400a3dd09
2015-11-10 10:24:58 +00:00
Matthias Radestock
64aa2b5cc3
refactor: remove weave overlay-isms from mesh
2015-11-09 20:56:04 +00:00
Matthias Radestock
1eed5fd271
cosmetic: don't mention UDP in mesh
2015-11-09 19:47:27 +00:00
Matthias Radestock
dd7ffa4501
code docs: warn against nonce re-use by overlay connection
2015-11-09 19:46:53 +00:00
Adam Harrison
5e79da0c9c
Merge pull request #1658 from weaveworks/tweak-circle
...
Upgrade CI to Docker 1.9 and work round issues
2015-11-09 17:55:27 +00:00
Bryan Boreham
65fe753a58
Remove code coverage as temporary work-around to Docker 1.9 issue
2015-11-09 17:18:59 +00:00
Bryan Boreham
17c835e672
Compress weave.tar to save upload time
2015-11-09 17:18:58 +00:00
Bryan Boreham
fa5bcd0457
Lump some commands together to reduce CircleCI waiting overhead
2015-11-09 17:18:58 +00:00
Bryan Boreham
499d6312b7
Don't need --add-host except in non-FDP case because we put the
...
mappings in the outer /etc/hosts
2015-11-09 17:18:58 +00:00
Bryan Boreham
20d5903696
Update test template name to pull in new Docker version
2015-11-09 17:18:57 +00:00
Adam Harrison
f039221ec9
Merge remote-tracking branch 'origin/create-mesh'
...
Closes #1659 .
2015-11-09 17:16:35 +00:00
Matthias Radestock
dc9f8762ca
move generic communication substrate into its own 'mesh' package
...
This is mostly a matter of moving some files, changing package names,
changing some imports, and changing some type references.
We duplicate the odd constant & global var, and the intmac/macint
functions, since neither 'router' or 'mesh' nor, really,' common' are
a natural home for them.
2015-11-09 16:37:39 +00:00
Adam Harrison
e5c69801a7
Merge remote-tracking branch 'origin/separate-overlay'
...
Closes #1648 .
2015-11-09 16:17:41 +00:00
Matthias Radestock
ab458368de
refactor: move NetworkRouterStatus into its own file
2015-11-09 15:51:11 +00:00
Matthias Radestock
8eb680fcc9
refactor: separate out NetworkRouter-specific status
2015-11-09 15:51:11 +00:00
Matthias Radestock
71b05972f4
refactor: move NetworkRouter into its own file
2015-11-09 15:50:55 +00:00
Matthias Radestock
7deeb8dba5
refactor: separate NetworkRouter from Router
2015-11-09 15:47:08 +00:00
Matthias Radestock
daad190188
refactor: split overlay.go to extract network overlay stuff
2015-11-09 15:47:08 +00:00
Matthias Radestock
7cc0052451
refactor: separate NullNetworkOverlay from NullOverlay
2015-11-09 15:47:07 +00:00
Matthias Radestock
18f8e29af8
refactor: separate NetworkOverlay from Overlay
...
...since connections only need to know about the latter.
2015-11-09 15:47:07 +00:00
Bryan Boreham