Matthias Radestock
08f31886d6
better docker version check
...
Fixes #567 . Supersedes #1298 .
2015-08-19 21:20:14 +01:00
Matthias Radestock
d61c719e45
cosmetic
2015-08-19 20:39:16 +01:00
Matthias Radestock
a93a3e98b9
warn when stopping proxy when the env is using it
2015-08-18 18:08:02 +01:00
Matthias Radestock
be94dcc8a3
introduce weave env --restore
...
`weave env` stashes the existing DOCKER_HOST in ORIG_DOCKER_HOST, and
`weave env --restore` sets DOCKER_HOST to $ORIG_DOCKER_HOST.
Closes #1288 .
2015-08-18 17:20:21 +01:00
Matthias Radestock
a34b31ad12
refactor: make proxy_addr more single purpose
2015-08-18 15:40:58 +01:00
Matthias Radestock
e1d07aa264
cosmetic
2015-08-18 15:34:43 +01:00
Matthias Radestock
0d79a8fc43
cosmetic
2015-08-18 15:08:59 +01:00
Matthias Radestock
f73dcba306
eliminate spurious warning when --ipalloc-range=""
...
Fixes #1320 .
2015-08-18 09:50:42 +01:00
Matthias Radestock
4ecaa0f508
don't put blank lines around sub-status
...
not what I had in mind, and it breaks the tests
2015-08-18 09:00:01 +01:00
Matthias Radestock
0e85783257
cosmetic: add blank lines around weave status output
...
Closes #1315 .
2015-08-18 01:38:51 +01:00
Matthias Radestock
2bb84ae28b
Merge branch '1.0'
...
Conflicts:
weave
2015-08-13 13:18:55 +01:00
Paul Bellamy
74eef4deda
[proxy] mount all tls volumes as readonly
2015-08-13 11:13:22 +01:00
Matthias Radestock
d0ed225184
Merge branch '1.0'
...
Conflicts:
weave
2015-08-11 15:01:54 +01:00
Matthias Radestock
f8639a57e7
prevent proxy from interferring with weave run
...
...which could result in containers unexpectedly getting multiple IP
addresses.
Fixes #1279 .
2015-08-11 14:02:23 +01:00
Adam Harrison
fc9a1c8664
new weave status, weave status ..., and weave report
2015-08-11 12:15:13 +01:00
Matthias Radestock
94af02fbf4
Merge branch '1.0'
...
Conflicts:
weave
2015-08-10 17:37:06 +01:00
Matthias Radestock
9e65cc20cb
cosmetic
2015-08-10 17:33:45 +01:00
Matthias Radestock
f4e7c85219
warn on -iprange overlap
...
Closes #1276 .
2015-08-10 13:27:06 +01:00
Matthias Radestock
010792f714
cosmetic: more sensible order of weave commands
2015-08-07 11:44:47 +01:00
Paul Bellamy
f55655216f
[proxy] rewrite /etc/hosts from outside the container
...
Avoids problems when container user is non-root. Added a test for this
and the --no-rewrite-hosts flag.
2015-08-06 13:14:18 +01:00
Adam Harrison
77996158ef
Merge branch '1.0'
2015-08-05 14:42:09 +01:00
Matthias Radestock
67aae051d6
send ARP update for *all* container IPs; not just the first one
...
This was missed in #498 .
2015-08-05 13:35:35 +01:00
Tom Wilkie
6fe69590c4
Add coverage to proxy for integration tests.
2015-07-29 12:06:29 +00:00
Adam Harrison
1701bc3e92
Merge branch '1.0'
...
Conflicts:
weave
2015-07-28 18:06:44 +01:00
Adam Harrison
a14d4d9f8e
Enforce docker bridge address assignment type on launch
2015-07-28 17:51:48 +01:00
Bryan Boreham
f0915221d1
Rename 'reclaim' to 'noErrorUnknown' which describes the behaviour better
2015-07-23 20:16:30 +01:00
Bryan Boreham
647b755b64
Check manually-assigned addresses with IPAM to see if they clash
2015-07-21 17:02:52 +01:00
Paul Bellamy
a9229b9197
weave env should still work with '--log-level=debug'
2015-07-20 11:57:20 +01:00
Matthias Radestock
fafaeef07d
introduce --no-dns option
...
undocumented, since it is mainly meant for testing
2015-07-19 22:51:40 +01:00
Matthias Radestock
5b62b8c1e3
refactor: inline populate_dns
...
and ditch the wait_for_status, since we've only just called that
2015-07-19 22:32:33 +01:00
Matthias Radestock
7c17c8aec3
refactor: simplify router arg parsing
...
using the same "always shift one" approach as in proxy_args
2015-07-19 21:56:04 +01:00
Matthias Radestock
64408b126e
weave launch-router wasn't returning the correct container id
...
since $CONTAINER gets stomped on by various functions, in particular
populate_dns.
Broken by #1065 .
2015-07-19 21:50:45 +01:00
Adam Harrison
da13238368
Merge branch '1.0'
2015-07-16 13:45:36 +01:00
Matthias Radestock
b32c017f33
fix detection of host netns when weave script runs inside container
...
$$ refers to the pid in the container's process namespace, so using it
as a reference into /hostproc is entirely wrong.
Fixes #1162 .
2015-07-16 13:19:56 +01:00
Paul Bellamy
a4a31e632b
[proxy] Choose where to listen based on how launching client connected
2015-07-16 12:44:39 +01:00
Matthias Radestock
3a22d2e6a1
Merge pull request #1135 from weaveworks/issues/1028-weave-dns-lookup
...
Implement `weave dns-lookup`
Closes #1028 .
2015-07-14 18:19:26 +01:00
Matthias Radestock
9a4bbb55da
Merge branch '1.0'
...
Conflicts:
proxy/common.go
weave
2015-07-14 18:09:25 +01:00
Adam Harrison
6832ae20b0
Implement weave dns-lookup
2015-07-14 17:36:30 +01:00
Matthias Radestock
7ae06ef00d
Merge pull request #1126 from weaveworks/issues/1018-more-flexible-hostname-derivation
...
[proxy] More flexible container name -> hostname derivation
Closes #1018 .
2015-07-14 17:31:53 +01:00
Alfonso Acosta
dfcc9678f3
Make weave usage fit into 80 columns
2015-07-14 16:02:19 +00:00
Tom Wilkie
8b061fd555
Gossip-based DNS embedded in the router.
...
- Nameserver holds a sorted list of (hostname, peer, container id, ip) tuples.
- Entries are gossiped using topology gossip / broadcast - only new/updated entries
are propogated as expected.
- Entries for a given peer are removed when the connection to the peer is lost.
- Entries are tombstoned when containers die. Tombstones are kept for 10mins,
as they do not need to survive partition, only gossip propagation delay.
2015-07-14 16:00:38 +00:00
Paul Bellamy
acd8bdec21
[proxy] respect custom DOCKER_BRIDGE
2015-07-14 16:33:35 +01:00
Alfonso Acosta
ded3d6b40b
Address PR comments
2015-07-14 15:31:44 +00:00
Alfonso Acosta
4f82dc97fd
[proxy] More flexible container name -> hostname derivation
...
Provides to new two new flags: `--hostname-match <regexp>`
and `--hostname-replacement <replacement>`. When launching a container, its name
matched against regular expression `<regexp>`. Then, based on that match,
`<replacement>` will be used to generate a hostname, which will ultimately be
handed over to weaveDNS for registration.
The substitution is implemented with
https://golang.org/pkg/regexp/#Regexp.ReplaceAllString . Thus, references to
regexp substitution groups should be prepended with a dollar sign.
For instance, if we provide `--hostname-match '^aws-[0-9]+-(.*)$'` and
`--hostname-replacement 'my-app-$1'`, running a container named
`aws-12798186823-foo` through WeaveProxy will lead to WeaveDNS registering
`my-app-foo`.
Closes #1018
2015-07-14 14:41:44 +00:00
Bryan Boreham
5e43f0fd4c
Merge pull request #1079 from weaveworks/68-rewrite-etc-hosts
...
LGTM. Closes #68 , with remainder to #1122
2015-07-13 11:03:20 +01:00
Tom Wilkie
f8718dcc5d
Remove duplication of coverage stanza in weave script.
2015-07-10 16:35:46 +00:00
Tom Wilkie
00a7490a1d
Code coverage for smoke tests.
...
Allow non-circle people to build coverage reports.
2015-07-10 14:45:14 +00:00
Paul Bellamy
e4458372e8
[proxy] weavewait rewrites /etc/hosts so weave ip is returned first from 'hostname -i'
...
Adds a --no-rewrite-hosts flag to the proxy, and be default, removes the
docker IP from hosts. We only discard the docker host when it exists, so
--net=none works.
2015-07-10 13:57:20 +01:00
Matthias Radestock
8eb092c754
display usage on stderr
...
so that the likes of $(weave proxy-typo-env) don't do weird things
Closes #1082 .
2015-07-07 15:39:47 +01:00
Alvaro
33921c2cfe
Merge pull request #1073 from weaveworks/971_check_container_alive_in_api
...
make container aliveness check part of the ipam & dns API
2015-07-07 16:08:40 +02:00