Alvaro Saurin
8a509168ee
New zone database
2015-05-26 10:53:12 +02:00
Alvaro Saurin
9c48c83701
Interfaces for the mDNS client and server
2015-05-26 10:53:12 +02:00
Matthias Radestock
6197f98c26
reword proxy intro a bit
2015-05-24 16:27:34 +01:00
Matthias Radestock
213208bf12
Merge branch 'bboreham-723-check-bridge'
...
Fixes #723 .
2015-05-24 11:30:47 +01:00
Matthias Radestock
5148ed7936
symmetry with create_bridge
2015-05-24 11:30:04 +01:00
Matthias Radestock
add68afe0a
simplify
2015-05-24 11:29:47 +01:00
Matthias Radestock
ec59d5abee
Merge branch '723-check-bridge' of https://github.com/bboreham/weave into bboreham-723-check-bridge
2015-05-24 11:20:43 +01:00
Matthias Radestock
a7fccf053f
Merge pull request #719 from bboreham/705-hide-404
...
Don't talk to IPAM unless 0 addresses supplied to 'hide'
Fixes #705 .
2015-05-24 11:15:00 +01:00
Matthias Radestock
b1af1f752d
refactor: extract a helper
2015-05-23 12:28:43 +01:00
Matthias Radestock
01bc994822
refactor: extract image creation
2015-05-23 12:14:58 +01:00
Matthias Radestock
2b8a1fe177
rename
2015-05-23 11:59:47 +01:00
Matthias Radestock
1c4beb5ef0
improve entrypoint/command selection tests
2015-05-23 11:58:00 +01:00
Matthias Radestock
b42b045c08
cosmetic: vertical alignment
2015-05-23 10:30:45 +01:00
Matthias Radestock
c904a650b6
cosmetic: reflow
2015-05-23 10:27:38 +01:00
Matthias Radestock
0612f27f1f
fix typo
2015-05-23 10:27:07 +01:00
Matthias Radestock
5387eb77ab
Merge pull request #721 from paulbellamy/proxy-ipam
...
Proxy support for IPAM
Closes #657 .
2015-05-23 10:24:53 +01:00
Matthias Radestock
0c01bb758e
Merge pull request #722 from errordeveloper/docs-branch-heads
...
Create `weave/<branch>/head` for latest branch docs
Closes #668 .
2015-05-22 18:48:14 +01:00
Paul Bellamy
11931f3ea2
[tests] extract gliderlabs/alpine and aanand/docker-dnsutils into var in
...
config.sh
@bboreham made me do it.
2015-05-22 15:52:36 +01:00
Paul Bellamy
cc82213147
add 'weave launch-proxy --with-ipam' flag
2015-05-22 15:52:36 +01:00
Matthias Radestock
f36af211c0
cosmetic
2015-05-22 15:41:29 +01:00
Matthias Radestock
b20b4a8675
Merge pull request #731 from dpw/connection-select-break
...
Fix use of "break" within "select" in LocalConnection actorLoop
2015-05-22 15:40:00 +01:00
David Wragg
dfa93436c2
Fix use of "break" within "select" in LocalConnection actorLoop
...
From the golang spec: 'A "break" statement terminates execution of the
innermost "for", "switch", or "select" statement within the same
function.' But the LocalConnection actorLoop seems to assume it
skips the "select" and terminates the enclosing "for".
As a result, if something did conn.Shutdown(nil), it would not actually
shutdown the connection. It turns out this is never a problem, because
Shutdown is always called with a non-nil error, even though there is code
in a few places to handle the nil case. By cleaning that up, the dubious
"break" is eliminated.
2015-05-22 11:26:30 +01:00
Paul Bellamy
d0320b43f9
realigning the weave help output columns
2015-05-22 10:04:10 +01:00
Paul Bellamy
73071f2c62
cleanup proxy test helpers
2015-05-22 10:04:09 +01:00
Paul Bellamy
c9409c5342
[proxy] Adding basic docs about IPAM integration
2015-05-21 15:37:37 +01:00
Paul Bellamy
46bdd8c67d
Proxy support for IPAM
...
Pass `-e WEAVE_CIDR=` to your container to use IPAM. If IPAM is not
enabled on the weave router, the container will be booted without weave
networking.
I'm not crazy about adding *another* undocumented weave cli command
(ipam-cidr), but it saves the proxy messing around finding container
IPs.
2015-05-21 15:37:37 +01:00
Bryan Boreham
22b8f482ea
Fix a couple of mistakes in get_ipam_cidr calls
...
(first one only caused a slight slow-down; second one only mattered if
your 'weave' container had a non-standard name)
2015-05-21 12:05:48 +01:00
Adam Harrison
387ec3fdd5
Add run-smoketests target to Makefile
2015-05-21 11:40:12 +01:00
Tom Wilkie
449bf45c2b
Try and ignore pull request pseudo-branches for circle build.
2015-05-21 09:50:38 +00:00
Bryan Boreham
b771528942
Check if Docker using weave bridge before inserting DROP rule
...
and comment the use of -I
2015-05-21 10:14:15 +01:00
Bryan Boreham
f727e56bad
Revert "consistency"
...
This reverts commit c5d5dd5fdc .
2015-05-21 09:54:46 +01:00
Matthias Radestock
c5d5dd5fdc
consistency
2015-05-21 05:46:07 +01:00
Matthias Radestock
6f68eb50aa
get rid of a silly redirect
2015-05-20 16:54:07 +01:00
Paul Bellamy
c63d2e531a
Merge pull request #712 from errordeveloper/vagrantfile-more-cleanup
...
Improve readability of Vagrantfile and cleanup this official image
2015-05-20 16:47:28 +01:00
Ilya Dmitrichenko
eb6f9faae7
Create weave/<branch>/head for latest branch docs ( close #668 )
2015-05-20 16:44:02 +01:00
Matthias Radestock
23dd02a05a
remove redundant check
2015-05-20 15:58:22 +01:00
Paul Bellamy
d24e75f76b
extract vagrantfile shared bits
2015-05-20 15:42:08 +01:00
Matthias Radestock
b119872b1b
Merge pull request #718 from paulbellamy/proxy-check-up
...
use grep in /sys to verify ethwe is up in tests
Closes #707 .
2015-05-20 13:47:48 +01:00
Paul Bellamy
eeaa6c9e2c
use grep in /sys to verify ethwe is up in tests
...
Closes #707 . `ip link show` seems to "lag" the real state. In tests
checking the physical link state is good enough.
2015-05-20 13:36:36 +01:00
Matthias Radestock
0a7211988a
Merge pull request #714 from paulbellamy/proxy-cmd-merge
...
refactor proxy entrypoint rewriting to match docker daemon
Fixes #709 .
2015-05-20 13:19:03 +01:00
Bryan Boreham
9e79d7dcca
Don't talk to IPAM unless 0 addresses supplied to 'hide'
2015-05-20 12:59:04 +01:00
Paul Bellamy
369466d3d4
refactor proxy entrypoint rewriting to match docker daemon
...
Closes #709
2015-05-20 11:41:15 +01:00
Matthias Radestock
f642db0462
Merge pull request #704 from bboreham/620-drop-docker
...
Drop traffic from docker0 bridge to weave bridge
Fixes #620 .
2015-05-20 11:24:41 +01:00
Bryan Boreham
906be31483
Regularise the ping tests across different subnets
2015-05-20 11:08:39 +01:00
Matthias Radestock
0220f9aaca
Merge pull request #713 from paulbellamy/proxy-exec
...
use exec instead of run, to replace weavewait with subprocess
Closes #708 .
2015-05-20 10:48:01 +01:00
Ilya Dmitrichenko
a48777e482
Clean test VMs as well
2015-05-20 10:47:15 +01:00
Bryan Boreham
4ee32cc12d
Extend smoke test for new drop rule
...
Note that we have to wrap the '!' in 'sh -c' to get the negation to work as expected.
2015-05-20 10:45:18 +01:00
Paul Bellamy
818e162fff
[proxy] use exec instead of run, to replace weavewait with subprocess
...
Closes #708
2015-05-20 10:35:52 +01:00
Bryan Boreham
6739e6c166
iptables rule to drop traffic from docker0 bridge to weave bridge
2015-05-20 10:27:38 +01:00
Ilya Dmitrichenko
3a0b341770
Improve readability of Vagrantfile and cleanup this official image
2015-05-20 08:24:18 +01:00