Paul Bellamy
74afbc5505
Proof-of-Concept for proxy TLS support
...
The code is quite messy, but particularly the argument parsing and
volume-mounting. Also, it doesn't support args with spaces, or
non-absolute file-paths.
2015-06-01 16:50:52 +01:00
Paul Bellamy
4774043295
Add release 0.11.1 to CHANGELOG
2015-06-01 16:23:40 +01:00
Matthias Radestock
1237bfe840
cosmetic
2015-06-01 14:40:39 +01:00
Paul Bellamy
c4fc2ecf09
Merge remote-tracking branch 'upstream/0.11'
2015-06-01 13:35:37 +01:00
Matthias Radestock
49ad336a35
Merge pull request #809 from paulbellamy/0.11
...
Rewording and clarifying proxy docs for 0.11.1 release
2015-06-01 13:32:28 +01:00
Paul Bellamy
6feaa72abd
[docs] elaborating on proxy IPAM and DNS interaction
2015-06-01 13:24:55 +01:00
Paul Bellamy
71d6f9cdfb
[docs] re-ordering proxy doc sections
2015-06-01 13:24:52 +01:00
Adam Harrison
59f919bda3
Merge pull request #795 from inercia/weave-711
...
Make the TTL configurable
2015-06-01 12:51:45 +01:00
Paul Bellamy
4e1d388017
weave status should look for proxy at 127.0.0.1 (since PROXY_HOST is gone)
2015-06-01 12:21:58 +01:00
Matthias Radestock
341d5ecbb6
remove out-of-date info from ipam docs
2015-06-01 12:15:14 +01:00
Matthias Radestock
2e208b4921
cosmetic
2015-06-01 12:15:05 +01:00
Matthias Radestock
c983d9f39f
cosmetic
2015-06-01 12:14:55 +01:00
Matthias Radestock
adc5784fc9
expand weavedns example to cover multi-host
2015-06-01 12:14:35 +01:00
Alex Chan
a8c3551040
Minor spelling corrections in docs
2015-06-01 12:14:20 +01:00
Matthias Radestock
ac90086fb1
Merge pull request #808 from paulbellamy/proxy-short-docker-host
...
weave PROXY_HOST is always localhost, so just hardcode it as that
Closes #807 .
2015-06-01 11:55:58 +01:00
Paul Bellamy
bd94c00e96
weave PROXY_HOST is always localhost, so just hardcode it as that
...
Because launch-proxy runs in weaveexec container, DOCKER_HOST is never
set.
2015-06-01 11:51:32 +01:00
Bryan Boreham
2698f3f376
Merge remote-tracking branch 'upstream/0.11'
2015-06-01 11:42:30 +01:00
Matthias Radestock
3332f94a00
Merge pull request #801 from bboreham/787-better-status
...
Improve ipam status message before and after pending consensus
Fixes #787 .
2015-06-01 11:17:19 +01:00
Matthias Radestock
fd0aa3f6ae
remove out-of-date info from ipam docs
2015-06-01 11:13:16 +01:00
Bryan Boreham
cd1cca3df2
Reformat output of pending ipam requests
2015-06-01 10:55:01 +01:00
Matthias Radestock
b86ead2737
fix tests post 9a1e8c07ac
2015-05-31 13:11:28 +01:00
Matthias Radestock
21ee0fdcf7
Merge branch '0.11'
2015-05-31 11:54:54 +01:00
Matthias Radestock
158fb36c8c
Merge remote-tracking branch 'upstream/0.11' into 0.11
2015-05-31 11:54:08 +01:00
Matthias Radestock
5f385a297c
remove bashism
...
This was introduced in #780 .
2015-05-31 11:51:34 +01:00
Matthias Radestock
8d0adb9359
refactor(ish): use full container id when we have it
2015-05-31 11:25:13 +01:00
Matthias Radestock
79eb4c298c
refactor: extract helper for and simplify get_ipam_cidr
2015-05-31 09:59:32 +01:00
Matthias Radestock
6f57bcb477
tiny refactor - use full container id, since we happen to have it
2015-05-31 09:35:53 +01:00
Matthias Radestock
54dbc2f582
cosmetic
2015-05-31 09:03:45 +01:00
Matthias Radestock
1a8f2117b1
explain Direct Peers status
2015-05-29 17:35:21 +01:00
Bryan Boreham
1d6f1f7561
Improve ipam status message before and after pending consensus
2015-05-29 17:34:17 +01:00
Matthias Radestock
59fd53ee99
Merge pull request #800 from paulbellamy/proxy-status
...
Add proxy info to 'weave status' output
Closes #756 .
2015-05-29 17:13:33 +01:00
Matthias Radestock
8c27d469a1
add Direct Peers to status output example
...
This was missed in #764 .
2015-05-29 17:05:34 +01:00
Paul Bellamy
7f62ba6ebe
Add proxy info to './weave status' output
2015-05-29 17:05:25 +01:00
Matthias Radestock
9a1e8c07ac
cosmetic: report direct peers on one line in status
2015-05-29 17:03:33 +01:00
Matthias Radestock
b7df116491
make weave reset stop the proxy
...
Missed this in #790 .
2015-05-29 16:43:18 +01:00
Paul Bellamy
ece1fa1b1b
Merge remote-tracking branch 'upstream/0.11'
2015-05-29 16:35:59 +01:00
Matthias Radestock
1769cdad7c
Merge pull request #799 from paulbellamy/proxy-attach
...
Proxy kills container and returns error when attach fails
Fixes #788 .
2015-05-29 16:35:25 +01:00
Matthias Radestock
99b1e00a75
Merge pull request #794 from paulbellamy/connect-replace
...
add 'weave connect --replace ...'
Closes #658 .
2015-05-29 15:52:32 +01:00
Matthias Radestock
e0f4da4641
Merge pull request #792 from rade/720_auto_assigned_dns_http_test_port
...
use an automatically assigned port for http tests
Fixes #720 .
2015-05-29 15:51:38 +01:00
Paul Bellamy
2be69634df
replace proxy /weave endpoint with /status
...
which is more standard with others, and doesn't conflict with docker api
2015-05-29 15:48:33 +01:00
Paul Bellamy
858356de22
add 'weave connect --replace ...'
2015-05-29 15:44:45 +01:00
Paul Bellamy
4f73ef73bb
weavewait should exit if it times out
...
To match behaviour of proxy when interface fails to attach
2015-05-29 14:37:58 +01:00
Paul Bellamy
0cb2e80e09
Proxy kills container and returns error when attach fails
2015-05-29 14:37:33 +01:00
Matthias Radestock
08a17ec376
no need for sleeps to wait for http server
...
Since we start the tcp listener in the main thread now, connections
can be made immediately; they will just queue up until there is a
handler.
2015-05-29 14:17:03 +01:00
Matthias Radestock
3ad08c0f2a
don't print the test port
...
it's of no interest whatsoever
2015-05-29 14:05:24 +01:00
Tom Wilkie
6e2bb075a6
Merge pull request #797 from weaveworks/timeout
...
Various fixes to circleci integration tests
2015-05-29 13:57:42 +01:00
Paul Bellamy
587a56cf31
Merge remote-tracking branch 'upstream/0.11'
...
Conflicts:
weave
2015-05-29 13:37:21 +01:00
Tom Wilkie
0a945a04f3
Add smarter scheduler to decide which tests to run on which shard on circle.
2015-05-29 12:35:43 +00:00
Matthias Radestock
10a9f58d13
Merge pull request #780 from paulbellamy/proxy-launch-2
...
simplifying and standardizing `launch-proxy`
Fixes #767 . Fixes #755 . Closes #757 .
2015-05-29 13:30:30 +01:00
Tom Wilkie
332a1bf58d
Checkin the assert.sh script, so we can expose test run time.
2015-05-29 11:48:49 +00:00
Paul Bellamy