Liang-Chi Hsieh
f5afe3b203
Merge remote-tracking branch 'upstream/master' into if_param
...
Conflicts:
weave
weaver/Dockerfile
2014-12-22 20:58:20 +08:00
Bryan Boreham
affb9aef42
Merge pull request #283 from rade/275_do_not_log_password
...
Closes #275
2014-12-22 11:31:16 +00:00
Matthias Radestock
7ccb9e36d9
update Dockerfile MAINTAINER
...
and also use what appears to be (based on some sampling of the docker
registry) the correct convention for specifying the email address.
Also ditch superfluous CMD instruction in weaver.
2014-12-22 11:11:00 +00:00
Liang-Chi Hsieh
1dc28e9025
Assign iface parameter from defined variable.
2014-12-22 15:59:29 +08:00
Matthias Radestock
33494f1b47
do not log password
...
This is trickier than it may first appear. We can't just filter the
password from os.Args, since that would require recreating the flag
parsing logic, which allows flags to be specified in a wide variety of
formats. And there is no API for calling that logic either.
So instead we log the results of the flag parsing, eliding the
password, and using a straight golang map for formatting (so we don't
have to get creative).
2014-12-19 23:56:30 +00:00
Matthias Radestock
ff69868922
allow password to be set through WEAVE_PASSWORD env var
...
so that passwords can be supplied w/o them showing up in 'ps'
2014-12-19 23:19:28 +00:00
Matthias Radestock
f33ecad3fb
don't be so defensive
...
(we are not that paranoid elsewhere)
2014-12-19 12:49:20 +00:00
Michael Bridgen
27beebf5d5
Factor out the wait-for-interface code
2014-11-03 17:47:16 +00:00
Matthias Radestock
6393e545ae
introduce 'weave connect' to connect a running router to other peers
...
Getting this to work with 'wget' is just too cumbersome especially
when it comes to getting the error message out. So 'curl' only.
2014-10-27 09:15:14 +00:00
Matthias Radestock
acbabc4f9e
s/StatusPort/HttpPort
...
since we are adding functionality other than status
2014-10-27 08:22:22 +00:00
Matthias Radestock
eb5548b1c3
move docker-ns
2014-10-22 14:29:18 +01:00
Matthias Radestock
b8c308dd09
move weave script
2014-10-22 14:14:33 +01:00
Matthias Radestock
bc02066bdb
move Makefile to top-level
2014-10-22 13:36:06 +01:00
Bryan Boreham
fe236e95db
Work round change in Docker 1.3 where 'Pulling' messages are included in 'docker run' output
2014-10-17 12:38:37 +01:00
Matthias Radestock
a587fef9c4
fix package name following move
2014-10-15 15:20:49 +01:00
Matthias Radestock
32a7975777
make it clearer in usage message that subnet is specified as CIDR
...
See issue #116
2014-10-11 03:59:48 +01:00
Matthias Radestock
0e4a30c9ee
refactor: 'ip addr list' -> '... show'
...
Since the man page only mentions the latter
2014-10-11 03:50:56 +01:00
Bryan Boreham
8de22f4bf1
reformat
2014-10-10 12:28:52 +01:00
Bryan Boreham
be39cb01bd
Resolve peer names to IP address at startup
2014-10-10 12:22:01 +01:00
Matthias Radestock
cf9c479727
check that the go stdlib was built with the required options
...
AFAICT, go build tags are a compile-time only construct, so there is
no way to query whether a certain package was built with a specific
tag. However, the 'netgo' tag triggers conditional compilation of the
cgo_stubs.go file, and that file name ends up in the executable. (we
could have looked for specific symbols in the 'net.a' library instead,
but that requires locating it first, which is more hassle than it is
worth)
issue #93
2014-10-09 20:57:56 +01:00
Matthias Radestock
7b02365de8
make dns resolution work in weave container
...
by using go's internal DNS resolver.
NB: this relies on go's std library having been compiled with the
netgo build tag, e.g.
sudo go install -tags netgo -a std
issue #93
2014-10-09 19:33:58 +01:00
Matthias Radestock
d4a2bc8024
document WEAVE_DOCKER_ARGS
2014-10-07 22:22:21 +01:00
Matthias Radestock
6d0df649fc
refactor: extract weave docker image name
...
Thanks to @hesco for the suggestion.
2014-10-07 19:32:39 +01:00
Matthias Radestock
764ced41b8
more portable bridge creation
...
using the documented 'ip link add' syntax
Thanks to @hesco for the suggestion.
2014-10-07 19:27:14 +01:00
David Wragg
399af7b0cb
Comment typo fix
2014-10-07 14:43:07 +01:00
David Wragg
c4c06a2dc0
Don't use /tmp for big files
...
/tmp is on tmpfs on some systems, so it's better to use /var/tmp
for large files.
2014-10-06 19:35:24 +01:00
David Wragg
89fa310c00
Provide a way to bypass the use of sudo
...
It's not necessary to be root to run "docker" commands, if your
user is in the "docker" group.
2014-10-06 19:34:12 +01:00
Matthias Radestock
e7e7de2173
check whether a container has died with docker rather than ps
...
since that means one less dependency on running 'weave' in the same
namespace as docker
2014-09-30 17:31:47 +01:00
Matthias Radestock
f4a5012dc7
refactor: keep bridge name abstract
2014-09-30 16:11:29 +01:00
Matthias Radestock
4d5faafd0c
refactor: order functions by dependency
2014-09-30 16:09:56 +01:00
Bryan Boreham
a09a229b44
Improve robustness
2014-09-30 16:02:06 +01:00
Bryan Boreham
c3fdee766f
Add iptables rule to forward traffic across the bridge, to avoid ufw blocking it
2014-09-30 15:24:30 +01:00
Bryan Boreham
a31d8c4d80
Refactor add_nat_rule into add_iptables_rule that is more general
2014-09-30 15:23:23 +01:00
Matthias Radestock
393b5cd459
automatically fetch dependencies
2014-09-30 13:13:41 +01:00
David Wragg
1366c01f6a
Restore comment that got lost when rearranging code
2014-09-29 09:59:26 +01:00
David Wragg
cb0541078a
Route multicast packets across the weave network
...
Add a route to send multicast packets to ethwe and so across the weave
network.
Without that, multicast packets get sent to the default route, i.e.
to docker's eth0 interface, rather than across the weave network.
So IP multicast doesn't work between containers on different hosts,
even though weaver supports it.
2014-09-26 09:30:46 +01:00
David Wragg
28e74c166a
Restructure attach and detach
...
To make the control flow more obvious.
2014-09-26 09:30:46 +01:00
Kai Davenport
f6b8e9a675
change -passwd to -password in usage function
2014-09-24 14:19:40 -07:00
Matthias Radestock
ada941cfcb
Merge branch 'bboreham-54_reboot'
...
Closes #54
2014-09-24 12:24:31 +01:00
Bryan Boreham
704c3dad67
Improved comment
2014-09-24 10:17:45 +01:00
Bryan Boreham
ad3a36686f
Cosmetic
2014-09-24 10:11:36 +01:00
Bryan Boreham
d5acb312b4
Rename 'configure_container_networking' to 'attach'
2014-09-24 10:01:52 +01:00
Bryan Boreham
dc611fa0af
Refactor common code in attach/detach
2014-09-24 09:39:44 +01:00
Matthias Radestock
02efccc36a
cosmetic
2014-09-23 16:18:00 +01:00
Matthias Radestock
5477f671db
Merge branch '54_reboot' of https://github.com/bboreham/weave into bboreham-54_reboot
2014-09-23 16:13:45 +01:00
Bryan Boreham
a21860689a
Merge remote-tracking branch 'upstream/bboreham-67_attach' into 67_attach
2014-09-23 16:05:45 +01:00
Bryan Boreham
9e3cbba275
Capture error output from ip command and check if error was caused by container dying
2014-09-23 16:00:03 +01:00
Matthias Radestock
8fa24fd6d4
Merge branch '67_attach' of https://github.com/bboreham/weave into bboreham-67_attach
2014-09-23 14:51:11 +01:00
Matthias Radestock
f59b9577c8
Merge branch '67_attach' of https://github.com/bboreham/weave into bboreham-67_attach
2014-09-23 14:49:02 +01:00
Bryan Boreham
8e50e0759d
Make attach and detach idempotent
2014-09-23 14:49:00 +01:00