github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-05 03:01:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,163 Commits 85 Branches 64 Tags
c149e5792aa1af45b53f166de70dcafeabf74f97
Commit Graph

4163 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alfonso Acosta
fb7af97d91 Merge pull request #594 from weaveworks/scope-modes 
[docs] Refer to different Scope setups as standalone and service modes
 2015-10-27 09:29:04 +00:00
Alfonso Acosta
6a9a6a05b8 User cloud service mode instead of service mode 2015-10-27 08:10:57 +00:00
Alfonso Acosta
9f8d6801c2 Address PR comments 2015-10-26 23:24:16 +00:00
Alfonso Acosta
314245325d [docs] Refer to different Scope setups as standalone and service modes 2015-10-26 19:27:07 +00:00
Alfonso Acosta
1fe32ad334 Merge pull request #592 from weaveworks/588-improve-version-extraction 
Make Docker version extraction more robust
 2015-10-26 19:14:57 +00:00
Alfonso Acosta
543109a524 Make Docker version extraction more robust 2015-10-26 18:07:11 +00:00
David Kaltschmidt
e2d488182d JS test dirs are now inlined 2015-10-26 17:51:41 +00:00
David Kaltschmidt
92e56a492b Fix package.json syntax error 2015-10-26 17:49:21 +00:00
David Kaltschmidt
a2877102f1 remove old karma test config, make webpackdevserver optional 
`npm install` continues to install everything, but `npm install
--no-optional` wont install the dev server.
 2015-10-26 17:49:21 +00:00
David Kaltschmidt
cacc2e1bc3 Move testing to Jest 2015-10-26 17:49:21 +00:00
Tom Wilkie
15371a2bba Merge pull request #584 from weaveworks/535-vendor 
Build in a container, use go1.5, vendor Dependancies, build for Darwin and Arm on Circle.
 2015-10-26 17:43:07 +00:00
Tom Wilkie
0e22171e46 Merge commit '21c126249fcb7bf8566035c43fc38f52637c17e3' into 535-vendor 2015-10-26 17:08:11 +00:00
Tom Wilkie
21c126249f Squashed 'tools/' changes from 3e16fe8..4fa0c68 
4fa0c68 Don't collect coverage metrics for vendored packages.

git-subtree-dir: tools
git-subtree-split: 4fa0c68afa
 2015-10-26 17:08:08 +00:00
Tom Wilkie
4fa0c68afa Don't collect coverage metrics for vendored packages. 2015-10-26 17:07:08 +00:00
Tom Wilkie
b17596111e Don't go get when running the tests. 2015-10-26 16:59:39 +00:00
Tom Wilkie
283e69decc Merge commit 'c6a083dd90ebe76e377a224dcc3e1e3c7ad95e66' into 535-vendor 2015-10-26 16:59:05 +00:00
Tom Wilkie
c6a083dd90 Squashed 'tools/' changes from 58c9a39..3e16fe8 
3e16fe8 Add -no-go-get option to test.

git-subtree-dir: tools
git-subtree-split: 3e16fe8d0a
 2015-10-26 16:59:02 +00:00
Tom Wilkie
3e16fe8d0a Add -no-go-get option to test. 2015-10-26 16:57:27 +00:00
Tom Wilkie
35bfa5f751 Okay, that was a bad idea 2015-10-26 16:53:21 +00:00
Tom Wilkie
0c790b966e sudo -E so environment variables (like GOOS and CIRCLECI) are passed through to docker 2015-10-26 16:44:41 +00:00
Tom Wilkie
ba2f3cf7d9 Add experiemental/vendor directory, with gopacket in there. 2015-10-26 16:29:45 +00:00
Tom Wilkie
fb49e146ad Build experimental stuff in a container too 2015-10-26 16:11:16 +00:00
Tom Wilkie
62aed75550 Fix couple of minor typos. 2015-10-26 15:42:06 +00:00
Tom Wilkie
00ac914be9 Don't need to clone a sepatate tools repo, or install a bunch of packages now. 2015-10-26 15:28:55 +00:00
Tom Wilkie
18a1354075 Add make tests target, which runs tests inside build container. 2015-10-26 15:23:00 +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
011a55358f Merge commit '8b52b10e38553a35d8134b428d6118a1ac011804' as 'tools' 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
58c9a390c5 Merge pull request #6 from weaveworks/add-runner 
Copy test runner from weave repo, add some more details to README.
 2015-10-23 11:04:21 +01:00
Tom Wilkie
beb4494499 Review feedback 2015-10-23 10:00:45 +00:00
Paul Bellamy
23e4459d56 fixing up typos 2015-10-23 10:50:01 +01:00
Tom Wilkie
f53a68b1b7 Copy test runner from weave repo, add some more details to README. 2015-10-23 09:48:04 +00:00
Tom Wilkie
785f9ebe7d Don't run tests in ./vendor 2015-10-23 08:54:11 +00:00
Tom Wilkie
8262e7e18e Don't lint vendor/ 2015-10-22 18:02:37 +00: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