Commit Graph
150 Commits
Author SHA1 Message Date
Mike Lang 02a2dd9d7a Fix ownership issues with client/build-external
When the directory is created during the build process, it is as root.

This prevents us deleting root-owned files inside the directory during make clean.

In client/build/, we get around this because the directory contains a tracked file,
so it's created during git checkout.
We make this the case for build-external by adding a hidden, empty file to track.
This won't fix existing checkouts though, so we also add a fix-up step to make clean.

The use of .gitignore as the empty file to track is taken from
	https://git.wiki.kernel.org/index.php/GitFaq#Can_I_add_empty_directories.3F
Specifically:
	"If you really need a directory to exist in checkouts you should create a file in it.
	.gitignore works well for this purpose"
2017-01-27 14:57:02 -08:00
jpellizzari 33844ca650 npm scripts change 2017-01-24 17:41:41 -08:00
jpellizzari b3f3dc180e Makefile changes 2017-01-24 17:21:31 -08:00
jpellizzari 9acca772a9 Added npm module scripts to CI 2017-01-24 13:36:39 -08:00
jpellizzari c776f35752 Combined external and prod webpack config files 2016-11-15 13:27:17 +00:00
Mike Lang 33a219bdbf Makefile: fix esc -include regex 2016-10-05 17:38:58 -07:00
Mike Lang ec37214778 Add flag to allow using external ui, and ability to upload to bucket during CI 2016-10-05 17:27:18 -07:00
Mike Lang 2c9f6c197f Split prog/static.go into two versions, and have a shim choose between them
This allows us to have both normal and external resource versions of static content
in the same binary, and switch with a flag
2016-10-05 17:26:57 -07:00
Mike Lang 21cfc83a56 Use image-tag from build-tools (#1785)
* Squashed 'tools/' changes from e9e7e6b..db5efc0

db5efc0 Merge pull request #28 from weaveworks/mike/add-image-tag
5312c40 Import image-tag script into build tools so it can be shared
7e850f8 Fix logs path
dda9785 Update deploy api
f2f4e5b Fix the wcloud client
3925eb6 Merge pull request #27 from weaveworks/wcloud-events
77355b9 Lint
d9a1c6c Add wcloud events, update flags and error nicely when there is no config

git-subtree-dir: tools
git-subtree-split: db5efc0537

* Remove ./image-tag and use ./tools/image-tag instead

image-tag is now shared code from the build-tools repo
2016-08-16 15:52:12 +01:00
Krzesimir Nowak 0f1cb82084 Allow testing only a subset of directories
This can be done by calling TESTDIRS="./report ./probe" make tests
2016-08-12 17:03:42 +02:00
Jonathan Lange ddf80d05cb Actually run shell-lint on tools 2016-07-12 14:22:09 +01:00
Paul Bellamy 691ad042c7 adding a demo json report to the scope dockerfile 2016-07-11 11:50:28 +01:00
Tom Wilkie b4abe582f4 Tag scope images on docker hub as we do in service (#1572) 2016-06-14 10:10:51 +01:00
Tom Wilkie 0d2e2cda8f Detect if sudo is required by running 'docker info' 2016-04-26 09:25:09 +01:00
David Kaltschmidt 8c5638edb2 Asset fingerprinting
* adds `?hash` to JS and CSS bundle URLs against caching in production
* uses `html-webpack-plugin` to generate html dynamically
* html based on template in `app/html/index.html`
* per-app html files no longer needed
* `build/` dir is now completely deleteable, and fully gitignored
* top-level `make` now requires `client/app` to pick up on html and
  style changes
* cleaned up `server.js` code for production bundle testing
* added readme entry about testing production bundles
2016-04-20 12:33:22 +02:00
Tom Wilkie 508ec016da Don't build codecs for render/ package anymore. 2016-04-19 14:52:10 +01:00
Tom Wilkie edef3551d3 Merge pull request #1296 from weaveworks/go1.6.1
Update to go 1.6.1
2016-04-19 12:59:33 +01:00
Tom Wilkie 8f03b67ade Add -s & -w flags to omit various symbol tables from the binary.
This does not effect backtraces.  Before the scope binary was 49M, now its 32M.

For more detauls, see https://blog.filippo.io/shrink-your-go-binaries-with-this-one-weird-trick/
2016-04-18 15:31:28 +01:00
Alfonso Acosta 91b3610b1b Do not enforce tags on make deps (#1301)
Dependencies are built out of the build container and we shouldn't enforce
specific tags.

It breaks the release process (see https://github.com/weaveworks/scope/wiki/Release-Process#go-to-a-linux-host)
in machines with standard Go installations resulting in:

```
go install net: open /usr/local/go/pkg/linux_amd64/net.a: permission denied
```
2016-04-14 15:33:20 +01:00
David 082754d8c3 Merge pull request #1210 from weaveworks/client-start
Fix make client-start
2016-04-07 18:30:46 +02:00
Tom Wilkie 25b4a76cf4 Put the -t back in the Makefile so we can ctrl-c builds. 2016-04-07 17:30:32 +01:00
David Kaltschmidt d9a1aa9807 Fix make client-start
* made webpack host configurable via env
* start via `make WEBPACK_SERVER_HOST=local.docker client-start`
* removed port from BACKEND_HOST env
2016-04-06 14:30:36 +02:00
David Kaltschmidt d520cffec7 Performance tweaks
Add debug.html to show toolbar

Perfjankie test runner

Playing w/ the pure mixin for perf. improvements

* Works well! Smoother zooming/panning when things have settled.
* Extract node movement to node-container, make nodes pure

Extracted node chart elements into own components

Keep control objects immutable while in components

Keep layout state objects alive

Made other components pure, removed mixin from stateless components

Remove font size adjustment from scaling

Fix zoomscale

Move node transform to node

* makes more sense there because the coords are rounded in the container

dynamic coords precision based on topology size

Make edge points immutable

Remove nodes maximum for layout engine

Dont send all canvas state down to next component

moving layout handling back to nodes-chart.js

Omit some props for edges/nodes, dont animate edges on low precision

Moved AppStore access out of lower components
2016-04-05 15:45:13 +02:00
Paul Bellamy cde2e1a826 added make clean-codecgen 2016-03-29 14:00:11 +01:00
Tom Wilkie 6716d2a5c7 Clean out all the JS in the client build dir. 2016-03-24 10:26:20 +00:00
Tom Wilkie a4e707d179 Project specific changes for misspell.
- Add misspell to build container.
- Add file to build container.
- Ignore dagre spelling
2016-03-23 10:51:21 +00:00
Alfonso Acosta 6a62037d30 Remove full bin directory of codecgen 2016-03-15 12:00:05 +00:00
Alfonso Acosta 987ccb7992 Fix typo 2016-03-15 10:20:04 +00:00
Alfonso Acosta e7c38a9de2 Simplify build
* Get rid of GO15VENDOREXPERIMENT since it's enabled by default in Go >=1.6,
  just use go 1.6 if you want to build outside the container.
* Stop using unset/env -u, just avoid adding env variables where needed.
* Pass build flags consistently to codecgen.
* Let the experimental/ directory be.
2016-03-12 17:42:40 +00:00
Simon Howe d7e9d1388f Support env -u e.g. unsetting vars under OSX 2016-03-10 11:25:16 +01:00
Alfonso Acosta 3391bcc62c Move codecgen dependencies to the no-containerized section 2016-03-10 11:25:15 +01:00
Alfonso Acosta 783297672c Invoke Go consistently and remove GO15VENDOREXPERIMENT from container 2016-03-10 11:25:15 +01:00
Alfonso Acosta ab6b00adf9 Provide identical go variables to codecgen 2016-03-10 11:25:15 +01:00
Alfonso Acosta 805bedf3e1 Create codecgen binary based on the host's architecture 2016-03-10 11:25:15 +01:00
Alfonso Acosta 125a0bfacd Remove codecgen-generated file before building package 2016-03-07 10:00:46 +00:00
Tom Wilkie f8ef3be522 Merge pull request #1042 from weaveworks/1004-codecgen-install
Build/install packages before invoking codecgen
2016-03-04 11:38:42 +00:00
Alfonso Acosta 46b4fa39ec Integration test 2016-03-01 20:36:56 +00:00
Alfonso Acosta 0eed16cb8e Build/install packages before invoking codecgen 2016-02-25 21:32:20 +00:00
Tom Wilkie 25e02d2d26 Turn off GC for builds. 2016-02-24 11:17:11 +00:00
Alfonso Acosta c741ee74d2 Pass correct tags to go run when invoking codecgen 2016-02-23 18:29:18 +00:00
Paul Bellamy f24ebc96b4 Merge pull request #1000 from weaveworks/reduce-codec-garbage
Reduce amount of objects allocated by the codec
2016-02-23 10:23:04 +00:00
Tom Wilkie 03099176da Refactor Makefile a little. 2016-02-22 15:16:45 +00:00
Alfonso Acosta 996062d64b Build github.com/ugorji/go/codec with -tags unsafe
See https://github.com/ugorji/go/issues/143#issue-134950331
2016-02-22 13:45:02 +00:00
Paul Bellamy e6b60e3e6d Merge pull request #966 from weaveworks/readme-dependencies
added note about docker and go dependency to the readme
2016-02-19 11:07:34 +00:00
Alfonso Acosta 6ac176a492 Remove github.com/2opremio/go-1/codec
* Bump github.com/ugorji/go/codec, to get fixes which make
  github.com/2opremio/go-1/codec unnecessary

* Remove github.com/2opremio/go-1/codec

* Remove type embeddings to avoid the problem explained at
  https://github.com/ugorji/go/issues/141#issuecomment-185450157
2016-02-18 12:47:06 +00:00
Alfonso Acosta 359919b456 Review comments 2016-02-17 13:18:17 +00:00
Alfonso Acosta 9c368c4e84 Implement Selfers for all render types
To workaround https://github.com/ugorji/go/issues/141
2016-02-16 23:52:32 +00:00
Paul Bellamy 2fc05672db containerize build of prog/static.go 2016-02-16 13:55:51 +00:00
Alfonso Acosta 0d917b2d8b Use github.com/ugorji/go/codec/ for wiring messages
* New encoding format:
  * Msgpack reports between probe<->app (smaller representation, faster to
    encode/decode).
  * Still use JSON between app<->UI (try to avoid making javascript deal with
    mspack).

  The app still suports publishing reports in both gob and JSON, not braking
  backwards compatibility.

* Use compile-time generated marshallers/unmarshallers for higher performance. In
  order to be able to skip code-generation for certain types, I included
  https://github.com/2opremio/go-1/tree/master/codec/codecgen instead of
  upstream until https://github.com/ugorji/go/pull/139 is merged.

* Encode/decode intermediate types using github.com/ugorji/go/codec.Selfer
  for higher performance and reducing garbage collection (no temporary buffers).
2016-02-16 06:31:31 +00:00
Simon 0ebefe02d6 Merge pull request #901 from weaveworks/900-fix-building-outside-container
Fixes building scope outside of a container.
2016-02-15 17:30:37 +01:00