Commit Graph

856 Commits

Author SHA1 Message Date
Tom Wilkie
18a1354075 Add make tests target, which runs tests inside build container. 2015-10-26 15:23:00 +00:00
Tom Wilkie
011a55358f Merge commit '8b52b10e38553a35d8134b428d6118a1ac011804' as 'tools' 2015-10-26 15:13:15 +00:00
Tom Wilkie
8b52b10e38 Squashed 'tools/' content from commit 58c9a39
git-subtree-dir: tools
git-subtree-split: 58c9a390c5
2015-10-26 15:13:15 +00:00
Tom Wilkie
aa55aecec5 Vendor some additional libraries for the tests. 2015-10-26 15:12:10 +00:00
Tom Wilkie
c05b76373f Review feedback 2015-10-26 14:23:30 +00:00
Tom Wilkie
147db96567 Make the build-in-container vs not clearer to make, so it doesn't always rebuild the exes. 2015-10-26 14:02:39 +00:00
Tom Wilkie
bb755979b1 Add vendored dependancies 2015-10-24 11:19:50 +01:00
Tom Wilkie
e8c96a0242 Turn on GO15VENDOREXPERIMENT in build container; don't go get. 2015-10-24 10:24:59 +01:00
Peter Bourgon
a48b6d4d1e Let's not squash. 2015-10-23 16:35:46 +00:00
Tom Wilkie
0288b3151b Use gocertifi instead of random ca-certs. 2015-10-23 16:35:41 +00:00
Tom Wilkie
f3b66428db Don't use fast datapath for our inter-container connection tests. 2015-10-23 16:35:18 +00:00
Tom Wilkie
7fd5a315e3 Build inside the build container, using go1.5, by default
Also build for GOOS=darwin and GOARCH=arm
2015-10-23 16:35:11 +00:00
Peter Bourgon
303bed1e2b Makefile: fix indentation 2015-10-23 14:38:17 +01:00
Tom Wilkie
780e370360 Merge pull request #581 from weaveworks/570-conntrack-loop
Retry conntrack, after a short delay, in a loop.
2015-10-22 10:02:20 +01:00
Tom Wilkie
492ca1692d Review feedback 2015-10-22 09:01:53 +00:00
Tom Wilkie
0cd3de5c7f Retry conntrack, after a short delay, in a loop. 2015-10-21 15:17:41 +00:00
Tom Wilkie
1e22629448 Merge pull request #577 from weaveworks/520-edge-bug
Include host scope for container joins based on IP.
2015-10-21 11:59:31 +01:00
Tom Wilkie
cd97708af0 Review feedback 2015-10-21 10:04:27 +00:00
Tom Wilkie
7e1a653349 Add status bar to setup.sh, compress the ssh tunnel to make it quicker. 2015-10-20 15:48:46 +00:00
Tom Wilkie
811bde4d4a Include host scope for contianer joins based on IP. 2015-10-20 14:50:40 +00:00
Paul Bellamy
d380df5dd6 Merge pull request #575 from weaveworks/559-probe-ssl-support
Add ssl support for the probe
2015-10-20 14:57:39 +01:00
Paul Bellamy
a1466cb3fc Review Feedback 2015-10-20 14:26:27 +01:00
Tom Wilkie
4cc9a1368d Merge pull request #574 from weaveworks/560-work-with-1.2
Make scope work with weave master.
2015-10-20 12:27:04 +01:00
Tom Wilkie
b06b13dccd Another typo 2015-10-20 10:43:20 +00:00
Tom Wilkie
a509c86d8b Typo 2015-10-20 10:38:10 +00:00
Tom Wilkie
b77fbcdaf1 Make scope work with weave master. 2015-10-20 09:48:12 +00:00
Paul Bellamy
659da5011e Merge pull request #565 from weaveworks/563-wss-websockets
Support wss for secure websockets when page was loaded over ssl
2015-10-20 10:13:54 +01:00
Alvaro
7408b1eb73 Merge pull request #562 from weaveworks/scope-504-1
Sort DNS answers before returning a name with Get()
2015-10-20 09:41:44 +02:00
Alvaro Saurin
a1f467f20f Sort DNS answers before returning a name with Get() 2015-10-20 09:23:19 +02:00
Tom Wilkie
d788758ca3 Merge pull request #572 from weaveworks/567-docs
Some extended basic documentation.
2015-10-19 17:50:53 +01:00
Paul Bellamy
d7e26228bd Support wss for secure websockets when page was loaded over ssl 2015-10-19 17:42:11 +01:00
Paul Bellamy
986abd24cd Add ssl support for the probe
Hosts ending in :443 are treated as SSL. There is also a
--probe.insecure flag, for using it in development environments where
SSL cannot be verified.
2015-10-19 17:32:32 +01:00
Peter Bourgon
5ac8ce5622 Move scope.md to main README. Updates, also. 2015-10-19 18:26:56 +02:00
Tom Wilkie
f87e51f849 Remove cloud. 2015-10-19 16:23:00 +00:00
Tom Wilkie
520365ac4e Merge pull request #557 from weaveworks/548-docker-version-check
Introduce docker version check into scope script, error on <1.5.0
2015-10-19 17:11:51 +01:00
Tom Wilkie
16d59d183c Merge pull request #571 from weaveworks/561-sort-topologies
Sort the structs returned by /api/topology
2015-10-19 15:55:20 +01:00
Tom Wilkie
9d754ba5f4 Typo 2015-10-19 14:47:33 +00:00
Tom Wilkie
8783fc4974 Review feedback 2015-10-19 14:41:26 +00:00
Tom Wilkie
163af5e681 Review feedback 2015-10-19 14:33:42 +00:00
Tom Wilkie
7f21622d37 Introduce docker version check into scope script, error on <1.5.0 2015-10-19 14:33:41 +00:00
Tom Wilkie
c9d0418c9f Review feedback 2015-10-19 14:09:53 +00:00
Tom Wilkie
e99c111413 Merge pull request #553 from weaveworks/329-print-command
Make getting the docker run command easier.
2015-10-19 14:50:48 +01:00
Paul Bellamy
745c94f07f Make getting the docker run command easier. 2015-10-19 12:24:10 +01:00
Paul Bellamy
6c336bdfc0 Merge pull request #547 from weaveworks/arm-build
Make Scope build on arm
2015-10-19 11:45:31 +01:00
Tom Wilkie
48f41adde7 Merge pull request #564 from weaveworks/send-service-credentials-to-api
Send the service credentials to initial /api request
2015-10-19 11:40:02 +01:00
Tom Wilkie
305e1f482c Refactor topology registry etc; merge a bunch of redundant types. 2015-10-19 10:33:39 +00:00
Tom Wilkie
258e2c153d Sort the structs returned by /api/topology 2015-10-19 10:33:35 +00:00
Tom Wilkie
f4192c1adb Some extended basic documentation. 2015-10-19 10:23:35 +00:00
Tom Wilkie
f26f998b09 Fix lint. 2015-10-19 10:17:46 +00:00
Paul Bellamy
637cb23ba8 Send the service credentials to initial /api request 2015-10-19 10:29:05 +01:00