Bryan Boreham
2d8318b158
Improved test for blank string
2014-09-23 13:53:20 +01:00
Bryan Boreham
a6b83a1234
Updated instructions for attach and detach
2014-09-23 13:52:41 +01:00
Bryan Boreham
d1896e86d0
Redesigned attach/detach
2014-09-23 13:01:21 +01:00
Bryan Boreham
0947fc204f
Untabify
2014-09-18 17:20:08 +01:00
Bryan Boreham
4868585d6e
Add detach command
2014-09-18 17:18:54 +01:00
Bryan Boreham
bb629bac84
Merge remote-tracking branch 'upstream/master' into 67_attach
2014-09-18 12:45:51 +01:00
Bryan Boreham
3c871e69d2
Merge branch 'master' of https://github.com/binocarlos/weave into 67_attach
...
Conflicts:
weaver/weave
2014-09-18 12:42:46 +01:00
Bryan Boreham
a671ca1a89
Merge branch 'add-attach' of https://github.com/adieu/weave into 67_attach
2014-09-18 12:31:53 +01:00
Matthias Radestock
331c8553db
cosmetic
2014-09-18 12:30:43 +01:00
Bryan Boreham
0ed57bad67
rm tempfile before we use it, to avoid attack via symlink
2014-09-18 11:56:15 +01:00
Bryan Boreham
86644f7615
cosmetic
2014-09-18 11:55:47 +01:00
Bryan Boreham
c48ae19c55
Tidy up messages; ensure errors to to stderr
2014-09-18 11:47:47 +01:00
Bryan Boreham
a75a0d8709
If and only if network setup because the container died, say so.
...
This involves capturing stderr output from all the 'ip' commands so we
can hide that output if we see the process died, or show it to the user
if the process didn't die, in which case we don't know why we failed.
2014-09-18 11:24:08 +01:00
Bryan Boreham
bfd5007339
Don't test if symlink exists before 'rm -f'
...
When the symlink's target doesn't exist, '[ -f' is false, so the symlink doesn't get removed.
Since we do always want it to be removed, just call 'rm -f' anyway, which won't complain
if the file doesn't exist.
2014-09-18 11:03:06 +01:00
Bryan Boreham
2f5a9733b8
Take out debugging -x mode
2014-09-17 16:32:21 +01:00
Bryan Boreham
0a403dd081
untabify
2014-09-17 16:31:52 +01:00
Bryan Boreham
09aed84638
return not exit from function
2014-09-17 16:30:50 +01:00
Bryan Boreham
eabcc55f73
fix subshell syntax and make del/delete consistent
2014-09-17 16:25:46 +01:00
Bryan Boreham
fd7b034713
untabify
2014-09-17 16:11:30 +01:00
Bryan Boreham
7c979d6725
Remove veth and/or netns symlink if interface configuration fails part-way through
2014-09-17 15:44:34 +01:00
Matthias Radestock
e287110099
improve error messages and make sure they all go to stderr
...
...since otherwise they get hidden when the output is redirected,
e.g. in the typical
# C=$(weave run ...)
invocation.
2014-09-17 06:46:02 +01:00
Kai Davenport
5490826666
attach command that accepts and existing container id and runs configure_container_networking using it
2014-09-15 10:25:59 -07:00
Bryan Boreham
81ad24b10f
Don't need 'exit 0' any more
2014-09-15 16:50:50 +01:00
Bryan Boreham
58c59caf1c
Merge branch 'master' into 56_display_version
2014-09-15 16:49:27 +01:00
Bryan Boreham
66b28593b2
Fix indenting
2014-09-15 16:48:12 +01:00
Bryan Boreham
87a4dee7ea
Added 'weave version' command per Issue #56
2014-09-15 16:32:19 +01:00
Bryan Boreham
39003233ea
Remove version/build-date info from weaver binary
2014-09-15 14:05:15 +01:00
Matthias Radestock
d2bd78435e
add 'weave reset'
...
Closes #20 .
2014-09-15 12:43:58 +01:00
Matthias Radestock
8297fef53d
remove WEAVE iptable chain on 'weave stop'
...
No point keeping it around.
Also, simplify idempotence of masquerading setup.
Follow-up to issue #48 .
2014-09-15 12:03:29 +01:00
Matthias Radestock
2f1359ae9f
remove masquerading rules on 'weave stop/launch'
...
Leaving iptable masquerading rules behind is a bad idea when weave is
re-launched with different ip subnet settings. So now we remove the
rules on 'weave stop' and also on 'weave launch' (in case weave had
been stopped in ways other than 'weave stop').
To make the rule removal easier, we create the rules in a user-defined
WEAVE chain.
Note that this will break old weave installations, since the rules
created by those are left behind. Easiest upgrade path is to restart
the machine. Or, for the brave, run `iptables -t nat -S POSTROUTING | grep weave | sed 's/^\-A/-D/g' | while read line; do iptables -t nat $line; done`.
Fixes #48
2014-09-15 11:34:57 +01:00
Matthias Radestock
f10c460f48
leave networking alone on 'weave launch' unless we start container
2014-09-14 19:31:27 +01:00
Matthias Radestock
4c93991651
ignore conntrack result in 'weave stop'
...
so we exit with status 0, since not having any existing flows is
perfectly normal
2014-09-14 19:08:00 +01:00
Matthias Radestock
948312f03d
refactor: extract container network configuration
...
and use more function parameters in preference to global vars
2014-09-13 21:45:42 +01:00
Matthias Radestock
6eb7e1aa43
disable offloading on weave bridge
...
since w/o it the kernel just ignores the PMTU when the host talks to
weave via 'weave expose'
Fixes #52
2014-09-13 19:58:54 +01:00
Matthias Radestock
b4791be4f4
refactor: extract command checking helper
2014-09-13 19:47:38 +01:00
Matthias Radestock
a53c817b8d
create bridge in 'weave expose/hide'
...
since they really need the bridge
2014-09-13 17:44:29 +01:00
Matthias Radestock
1fac995248
work around 'docker rm -f' weirdness
...
I've been seeing
~# docker rm -f weave
Error response from daemon: Cannot destroy container weave: Driver devicemapper failed to remove root filesystem 29e46c3e400ee3c8654f2b06a0f6d97bde98dfeb9bb61d25195dba38c04324fc: Device is Busy
whereas the corresponding two-step 'docker kill' + 'docker rm' works
fine.
2014-09-13 07:51:06 +01:00
Bryan Boreham
21bec9fc78
Add a -version command to weave and weaver, implemented by embedding the build date by the makefile
2014-09-12 17:53:06 +01:00
Bryan Boreham
6483c89a2b
Factor out commands implemented via the REST interface
2014-09-12 17:51:30 +01:00
adieu
a91357978d
Add attach command to weave.
2014-09-12 00:36:21 +08:00
Matthias Radestock
51afd5e9c6
make 'weave launch' cope gracefully with existing 'weave' containers
...
Fixed #31
2014-09-11 07:56:26 +01:00
Matthias Radestock
710cf7ea8a
nicer error on 'weave stop' and make it idempotent
2014-09-11 07:33:02 +01:00
Matthias Radestock
b6351acb66
simplify error message
2014-09-11 07:19:14 +01:00
Matthias Radestock
dbbb8c690a
nicer error message on 'weave status' when there is no weave container.
2014-09-11 07:15:15 +01:00
Matthias Radestock
96766db5f0
consistency
2014-09-11 07:12:49 +01:00
Matthias Radestock
8e6a9fb9b8
explain the 'iptables -w' check
2014-09-05 14:35:43 +01:00
David Wragg
91268fa0ba
Check that 'iptables -w' is supported before using it
...
'-w' was only introduced in a recent version of iptables. It means
"Wait for the xtables lock", so it seems reasonable to proceed without
it for older versions.
2014-09-05 12:51:41 +01:00
Bryan Boreham
733af3f108
Swap round 'status' and 'stop' in usage
2014-09-04 15:24:18 +01:00
Bryan Boreham
04ca3d2469
Addressed various points raised in review: error-handling, simplified Fprint call
2014-09-04 14:44:42 +01:00
Bryan Boreham
67d8220bdf
Convert one further use of 'command -v' into the function command_exists
2014-09-04 13:04:19 +01:00