Commit Graph
278 Commits
Author SHA1 Message Date
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
Matthias Radestock 23dd02a05a remove redundant check 2015-05-20 15:58:22 +01:00
Bryan Boreham 6739e6c166 iptables rule to drop traffic from docker0 bridge to weave bridge 2015-05-20 10:27:38 +01:00
Paul Bellamy fdd0bd3b35 remove usage of backticks in bash script 2015-05-19 11:26:55 +01:00
Paul Bellamy 55d17ba3bf separate proxy package into weaveproxy and proxy 2015-05-19 10:34:46 +01:00
Paul Bellamy bedc20c7c1 extract docker-bridge-ip fetching from proxy into bash script 2015-05-19 10:34:46 +01:00
Paul Bellamy 96a69d2303 Add dns support for the proxy
In the proxy, I swapped the 'flag' library for
'code.google.com/p/getopt', which uses double-dash flags.

proxy lets 'weave attach' do dns registration on container start

proxy needs to set DNSSearch if not specified
2015-05-19 10:34:45 +01:00
Michael Bridgen 6c4271f15d Add launch-proxy command to cli
Use curl /weave to wait for the proxy to boot before returning.
2015-05-19 09:48:12 +01:00
Matthias Radestock e9963945d6 cosmetic 2015-05-18 23:38:37 +01:00
Bryan Boreham 0227f7e727 '&& true' was a typo - replaced with '|| true' 2015-05-18 16:06:38 +01:00
Matthias Radestock d53ec858a2 Merge pull request #689 from bboreham/671-hide-errors
Silence complaints from http_call when at end of 'weave hide'

Fixes #671.
2015-05-18 15:59:45 +01:00
Bryan Boreham 7cf8234d9f Silence complaints from http_call when at end of 'weave hide' 2015-05-18 14:54:46 +01:00
Bryan Boreham 48e9c53dda Fetch an address from IPAM for 'weave --local run' 2015-05-18 12:06:06 +01:00
Matthias Radestock 11d241eccd cosmetic: better error message 2015-05-16 03:17:07 +01:00
Matthias Radestock dbcdace361 tiny refactor: outdent 2015-05-16 02:50:02 +01:00
Matthias Radestock 47727e23f1 fix quoting, unbreaking multi-cidr weave start/attach/hide
Fixes #670.
2015-05-16 02:42:10 +01:00
David Wragg 4b942e8ed5 populate_1_ipam -> ipam_claim 2015-05-15 13:12:36 +01:00
David Wragg 0eee999d7c Unify common call to wait_for_status upon "weave launch" 2015-05-15 11:49:36 +01:00
Bryan Boreham 3cd1a17c23 IP Allocation Management
Using the Ring CRDT and Weave gossip, provides an interface
for the weave script to allocate IP addresses in `weave run`,
`weave start` and `weave expose`.

See docs/ipam.md for implementation details, and site/features.md
for user-visible changes.
2015-05-14 17:44:06 +01:00
David Wragg 3e4f7358a7 Mention "CIDR notation" rather than "CIDR" in error message
It's more web-searchable.
2015-05-12 15:48:33 +01:00
Matthias Radestock 9195894d2a Show error message when DNS population fails part way through.
Closes #393.
2015-05-12 11:49:48 +01:00
Matthias Radestock db198652a5 refactor: get rid of test-launch 2015-05-09 17:29:13 +01:00
Matthias Radestock 5472d868aa refactor
we don't need to extract the -nickname option since when the same
option is specified more than once, the last value wins
2015-05-08 18:28:22 +01:00
Matthias Radestock 5a3ff111ef cosmetic 2015-05-08 18:24:43 +01:00
Andrew Kennedy 633d539b60 New commands to add and remove DNS entries
- Commands dns-add and dns-remove added to weave script
- Updated documentation for WeaveDNS
- Added test script for dns-add and dns-remove
- Added IP address functions matching existing CIDR ones
2015-05-07 12:13:59 +01:00
Matthias Radestock 04ceb5620b allow user to supply args to docker for remote execution
DOCKER_CLIENT_ARGS - for args to docker
WEAVEEXEC_DOCKER_ARGS - for extra args to `docker run`

Closes #626.
2015-05-07 09:27:22 +01:00
Matthias Radestock 63829a07c5 fix typo 2015-05-06 23:35:32 +01:00
Matthias Radestock e23c15dab2 hostname->fqdn 2015-05-05 18:58:44 +01:00
Matthias Radestock d8f1a04467 only NAT when crossing between subnets
otherwise we can end up NATing traffic inside a subnet, placing it
outside the subnet and thus breaking connectivity.
2015-05-05 16:00:37 +01:00
Matthias Radestock 56038674b1 enable weave script debugging with WEAVE_DEBUG
Closes #618
2015-05-04 10:28:24 +01:00
Matthias Radestock 72e8b3dcc0 fix comment 2015-05-03 21:42:26 +01:00
Ilya Dmitrichenko 9d0c9f1264 Move definition of $PROCFS (cosmetic)
It's not required to be set at the top, it's only looked at down below.
2015-04-30 13:49:39 +01:00
Michael Bridgen d710684f8e Should not pass value of $PROCFS (close #622)
This is picked from squaremo/weave@d3cc606d5b

The environment variable `PROCFS` was originally added so that the script
could be run in a container. The host's /proc is bind-mounted as /hostproc,
and the script must be told this.

The remote weaving changes got this a bit wrong, by using the value of
`$PROCFS` in a "volume" mount argument (`-v`) to docker -- but when
invoking a container, the left-hand-side of the volume mount should
*always* be `/proc` (and the right-hand-side always `/hostproc`),
since it will always be binding the host's `/proc` to the container's
`/hostproc`.

The gist is that docker looks at host's root filesystem and if you
pass `-v /hostporc:/hostproc` when running from a container where
you have already bind-mounted it, it will end-up creating empty
directory in the target container as there is no `/hostproc` from
docker's perspective.
2015-04-30 13:49:29 +01:00
rade 153731c1f3 Merge pull request #614 from awh/fix_weave_version
`weave version` continues after missing image

Fixes #597.
2015-04-28 18:23:09 +01:00
rade df9e188867 Merge pull request #613 from awh/fix_weave_detach
Detach of unattached container succeeds silently
2015-04-28 18:20:38 +01:00
Adam Harrison c0d6eb4a22 Require Linux kernel 3.8.0 or above 2015-04-28 15:05:47 +01:00
Adam Harrison bafea4bc0e weave version continues after missing image 2015-04-28 11:47:32 +01:00
Adam Harrison cf299f59de Detach of unattached container succeeds silently 2015-04-28 11:26:31 +01:00
Matthias Radestock ed894d52c9 guard against early container death in wait_for_status 2015-04-23 17:28:03 +01:00
Matthias Radestock 4a8fe43036 refactor: simplify "return 1 on error" code 2015-04-23 17:21:56 +01:00
Matthias Radestock ec29c2c776 cosmetic 2015-04-23 08:04:12 +01:00
Matthias Radestock 7135508d66 bump docker version requirement for --with-dns
and explain why

Fixes #587.
2015-04-21 22:46:13 +01:00
Matthias Radestock 7221744d9a Merge remote-tracking branch 'upstream/master' 2015-04-21 19:47:20 +01:00
Adam Harrison 89e0a6098c Replace ip netns exec calls with nsenter 2015-04-21 17:28:06 +01:00
Matthias Radestock cbe73e7645 switch dockerhub user from zettio to weaveworks 2015-04-21 15:37:41 +01:00
Matthias Radestock 16f3a96a67 fix handling of --dns-search
This got broken in b4c00050e0.
2015-04-20 12:58:04 +01:00
Matthias Radestock 1e3d429d58 refactor: better increment 2015-04-20 12:45:57 +01:00
Matthias Radestock b4c00050e0 simplify dns-args
it makes more sense to strip off the `--with-dns` at the call site.
`weave dns-args` now does something useful, instead of having to be
invoked as `weave dns-args --with-dns`.
2015-04-20 11:31:12 +01:00
Matthias Radestock 53e145bea7 simplify local portion of weave run
pull all the local `weave run` execution into one place, thus
dispensing with the need to have lots of tests for whether we are
executing in the context of "--local".
Also, we only remote exec dns-args if "--with-dns" is supplied, which
is more efficient in the common case (and also more obvious).

NB: we need to retain the docker version check for `run` since the
specific breakage it guards against does affect the code we execute
locally for `run`.
2015-04-20 11:30:56 +01:00