github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-04 02:30:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,122 Commits 85 Branches 64 Tags
041ebed8a35b98ea3b9256bae6a2e2923fa8d891
Commit Graph

5122 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcus Cobden
041ebed8a3 Fix path confusion in bundle building 2018-09-26 12:16:49 +01:00
Marcus Cobden
1e67ef2231 Merge pull request #3353 from weaveworks/rework-ui-build 
Rework UI build to improve caching and fix packaging issue
 2018-09-26 11:47:24 +01:00
Marcus Cobden
3f37ec011b Also cache the client/node_modules 2018-09-26 11:22:54 +01:00
Marcus Cobden
3a0dc3c34f Fix CI by removing Dockerfile workdir 2018-09-26 10:41:31 +01:00
Marcus Cobden
aafab27c74 Add Makefile target for UI build toolchain 2018-09-26 10:41:31 +01:00
Marcus Cobden
c03e6a0e50 Rework UI build to improve caching and fix packaging issue 
Stop baking the toolchain and dependencies into the build image.
Instead, run the install step each time, but use volume mounts or
CircleCI caching to keep the happy path fast.

Previously, some parts of the client (UI) directory were baked into the build
image, and some parts were mounted or copied into the build environment.
As a result, files baked into the build image require a two-step
update for changes to take effect in CI.

Now, for dockerised builds, we pre-install very little into the build
image and mount the whole directory into the build environment.
However, we do overlay a volume on the node_modules folder to allow the
standard build toolchain to be separate from the host build toolchain.

Non-dockerised builds (e.g. CI) are now more similar to the dockerised
versions.
 2018-09-26 10:41:30 +01:00
Bryan Boreham
b3ce733230 Merge pull request #3339 from weaveworks/note-public-amis 
Note how to make an EC2 AMI public
 2018-09-26 10:06:35 +01:00
Bryan Boreham
2df731b418 Merge pull request #3347 from visualapps/fix-terminal-in-contrast-mode 
import missing terminal.scss in contrast.scss
 2018-09-25 17:39:02 +01:00
Filip Barl
fdd3c4f147 Bump ui-components to v0.12.3 2018-09-24 15:39:59 +02:00
Filip Barl
3f66348ad7 Bump ui-components to v0.12.2 2018-09-17 16:43:19 +02:00
Filip Barl
39530aaaea Merge pull request #3349 from weaveworks/3348-on-route-change-hook 
Add onRouteChange hook to Scope app
 2018-09-17 14:10:42 +02:00
Filip Barl
eb767ed280 Add onRouteChange hook to Scope app. 2018-09-17 12:45:43 +02:00
visualapps
8d33d8b4d1 import missing terminal.scss in contrast.scss 2018-09-14 15:11:24 +05:30
Bryan Boreham
04592e4770 Note how to make an EC2 AMI public 2018-09-10 10:33:30 +00:00
Filip Barl
69d1c6eb24 Merge pull request #3337 from weaveworks/3314-use-new-search-bar 
Use new Search component
 2018-09-06 17:32:31 +02:00
Filip Barl
0fcc9f1517 Added some top margin to Search hint. 2018-09-06 17:17:09 +02:00
Filip Barl
4c55761bb7 Bump ui-components to v0.11.31 2018-09-06 17:12:30 +02:00
Filip Barl
a42f0f087e Bump ui-components to v0.11.30 2018-09-05 12:47:15 +02:00
Filip Barl
3c6cced4d3 Use new Search component. 2018-09-04 14:11:50 +02:00
Bryan Boreham
d6bbf690e6 Use build images with master tag 2018-09-01 14:34:25 +00:00
Bryan Boreham
fda40b8338 Merge pull request #3333 from weaveworks/circle-2.0 
Move to CircleCI 2.0
 2018-09-01 13:48:06 +01:00
Bryan Boreham
65bdb145f9 Merge pull request #3334 from weaveworks/registry-test-sleep 
Sleep to stop TestRegistryDelete() failing
 2018-09-01 13:47:30 +01:00
Bryan Boreham
d9e88c0e43 Use newer ui-build image 2018-08-30 11:57:40 +00:00
Bryan Boreham
1734def7ee Get deploy step to work 
Simplify deploy shell scripts;
Run yarn bundle as part of client-build step;
Install awscli as part of deploy step;
Don't run ui-upload in another container.
 2018-08-30 10:13:43 +00:00
Bryan Boreham
7b9a15efbf Combine arm and darwin build jobs 
saves spinning up another container
 2018-08-30 10:13:42 +00:00
Bryan Boreham
8a0c42299e Use newer build image 2018-08-30 10:13:42 +00:00
Bryan Boreham
6a51cd8185 Tidy up 2018-08-30 10:13:42 +00:00
Bryan Boreham
cf0d85b7f4 Run coverage as part of integration test job 
This lets it run at the same time as GCE VMs are deleted, and saves us
having to run up another job just for coverage.
 2018-08-30 10:13:42 +00:00
Bryan Boreham
29e6409fab Move all go installs to same Dockerfile step 
Reduces the size of the resulting image
 2018-08-30 10:13:42 +00:00
Bryan Boreham
e1552de65a 'requests' is installed via pip; we don't need to install via apt-get too 2018-08-30 10:13:42 +00:00
Bryan Boreham
1d2a5c6544 Set up dependencies for integration test job 
* Build 'runner' program in build job and save to workspace;
* Save build outputs - externalui, staticui, codecgen output;
* Install required tools in test VM;
* Call 'make deps' in integration-tests-job and touch 'runner' from
  workspace so it doesn't rebuild.
 2018-08-30 10:13:42 +00:00
Bryan Boreham
8b9d49d9d6 Run client static build 
and run client lint and test in the same job, after client-build,
to reduce the number of jobs running in parallel.
 2018-08-30 10:13:42 +00:00
Bryan Boreham
5d029d74f1 Install docker client in build container 2018-08-30 10:13:42 +00:00
Bryan Boreham
ebfed1bc83 Don't insist the build container is up-to-date when BUILD_IN_CONTAINER=false 
Why do you care?  You're either inside it or not using it.
 2018-08-30 10:13:42 +00:00
Bryan Boreham
d7b40846a4 Run arm and darwin builds after main build 
Try to balance the parallelism more
 2018-08-30 10:13:42 +00:00
Bryan Boreham
fd08129e30 Remove deploy-dev job; it isn't used 2018-08-30 10:13:42 +00:00
Bryan Boreham
c07b6b5ca8 Sleep to stop TestRegistryDelete() failing 2018-08-30 10:13:42 +00:00
Bryan Boreham
c1b93c3161 Break into steps, use current build images 2018-08-30 10:13:42 +00:00
Bryan Boreham
ec49a38b83 Tag build images with git hash 2018-08-30 10:13:41 +00:00
Bryan Boreham
89d7ab1677 Remove unnecessary file 2018-08-30 10:13:41 +00:00
Bryan Boreham
191b6c8c08 Don't need a third build image 2018-08-30 10:13:41 +00:00
guyfedwards
9efcea41b9 add docker build image; 2018-08-30 10:13:41 +00:00
guyfedwards
fc7e5bf9f8 fix env defaults 2018-08-30 10:13:41 +00:00
guyfedwards
6b4a51563f initial 2018-08-30 10:13:41 +00:00
Simon
b090dfe788 Merge pull request #3326 from weaveworks/option-disable-store-view-state 
Adds a scope-cmp prop to disable storing the view state in localStorage
 2018-08-30 08:47:47 +02:00
Daniel Holbach
6abeced17a Merge pull request #3336 from dholbach/update-tcptracer-bpf 
update vendored copy of tcptracer-bpf
 2018-08-28 17:24:28 +01:00
Daniel Holbach
f05d741c88 update vendored copy of tcptracer-bpf 
See https://github.com/iovisor/gobpf/pull/139 and
  https://github.com/weaveworks/tcptracer-bpf/pull/61 for more info
  on the change.

  gvt update github.com/weaveworks/tcptracer-bpf
 2018-08-28 16:56:30 +01:00
Bryan Boreham
4e08ea0869 Merge pull request #3325 from weaveworks/trace-context-detect 
Add middleware to detect jaeger trace context over HTTP
 2018-08-28 14:32:31 +01:00
Marcus Cobden
67b887cb5d Add middleware to detect trace context on HTTP 2018-08-28 13:32:29 +01:00
Marcus Cobden
6f17a2961c Update weaveworks/common to d442d08d89b51712ca61de3f7c14e2e218a739d7 
Changes:
- Default diff-printer to hide details (#103) - da4c3ff
- Improve logging of http errors (#115) - f5a1710
- Update httpgrpc to match weaveworks/cortex#910 (#117) - 80ff076
- Expose the HTTP server from the server struct. (#118) - 1a7a6b3
- Add HTTP tracing middleware (#119) - d442d08
 2018-08-28 11:35:54 +01:00