Commit Graph

64 Commits

Author SHA1 Message Date
Bryan Boreham
0d0ccd989b Remove 'demo.json' file, not used in Scope 2021-04-04 13:45:05 +01:00
Juan Calderon-Perez
69dd8853c4 Update alpine base image to 3.13 (#3838)
* Bump alpine to 3.13.2
2021-03-17 13:25:04 +00:00
Bryan Boreham
d81ccf7466 Update alpine base image to 3.11.3
Note I'm pinning the minor version here, otherwise it can vary
depending on what's on your machine when you build.
2020-03-23 12:56:43 +00:00
gruebel
27a8bf1008 Clean up Dockerfiles 2018-10-27 17:24:00 +02:00
Bhavin Gandhi
9c2fe36c0e Remove weaveutil and weave from Dockerfile.cloud-agent
- Moves the weave and weaveutil from Dockerfile.cloud-agent to
  Dockerfile.scope

Signed-off-by: Bhavin Gandhi <bhavin7392@gmail.com>
2018-10-02 10:59:51 +05:30
meghalidhoble
625998b91e Change made to the listed files, to enable weaveworks-scope on Power(ppc64le)
1)backend/Dockerfile 2) probe/endpoint/dns_snooper.go
3) client/Dockerfile 4) docker/Dockerfile.cloud-agent
5) probe/process/walker_linux_test.go & 6) tools/lint

1)'backend/Dockerfile' : Conditional added so that the cross-compiling should
   be done on amd64. Also removed support for sh-lint for ppc64le for now.
   As the version for shfmt mentioned in the dockerfile is not available for
   ppc64le and the later version does't work fine with existing application.
2)'probe/endpoint/dns_snooper.go' : Renamed this file so as to reuse for ppc64le
   and added a build-constraint. Now this file will be build for amd64 on linux
   and ppc64le on linux.
3)'client/Dockerfile' : Modified the version of the base image for node from
   8.4.0 to 8.11, as this version supports multiarch.
4)'docker/Dockerfile.cloud-agent' : Modified the version of the base image for
   golang from 1.10.2-strech to 1.10.2, which supports multiarch.
5) 'probe/process/walker_linux_test.go' : Test fixed to run for ppc64le,
    modified the code to accept RSSBytes based on pageSize value per
    architecture, instead of hard-coded values.
6)'tools/lint' : Modified the file to skip the sh-lint implementation for ppc64le.

PR #3231
2018-08-13 12:45:25 +05:30
Marc Carré
4e58b83024 Add org.opencontainers.image.* labels to Dockerfiles
- This should ultimately help for image-to-code back references.
- `org.label-schema.*` labels are now deprecated, in favour of `org.opencontainers.image.*` labels.
  See also: https://github.com/opencontainers/image-spec/blob/master/annotations.md#back-compatibility-with-label-schema
- Git revision (`git rev-parse HEAD`) is now injected at `docker build` time.
2018-05-14 11:54:33 +01:00
Matthias Radestock
efbfd5d582 don't embed docker binary
We needed it because some of our invocations of Weave Net's `weave`
script depended on it, but that is no longer the case as of Weave Net
2.1.

Fixes #2974.
2017-12-11 17:02:20 +00:00
cglewis
bbde07d42f MAINTAINER is deprecated, now using LABEL 2017-10-31 10:32:09 -07:00
Matthias Radestock
0aec6feed0 consistency: --no-app is used elsewhere; --probe-only isn't 2017-03-04 11:32:14 +00:00
Alfonso Acosta
98395bb595 Create cloud agent image (#2284)
* Create cloud-agent image

* Refactor Makefile

* Push the image from CircleCI and releases

* Review feedback

* Review feedback

* Review feedback
2017-02-27 17:49:26 +01:00
Alfonso Acosta
f892cb14a0 Review feedback 2017-02-24 14:36:25 +00:00
Alfonso Acosta
41c7451795 Review feedback 2017-02-24 13:50:20 +00:00
Alfonso Acosta
051884d26a Embed Docker 1.13.1 (but force protocol 1.22) 2017-02-24 13:50:19 +00:00
Bryan Boreham
a60192d98a Install weaveutil so we don't have to run it via docker 2017-02-24 12:31:10 +00:00
Mike Lang
0629eada0c Upgrade container base image to alpine:3.5
As well as upgrading to latest stable being nice in general,
this was triggered by an issue where we could no longer find the bash package in 3.3

This upgrade also lets us get rid of reliance on the edge (rolling latest) repository
for runit, since 3.5 now contains runit natively.
2017-01-26 13:27:06 -08:00
Iago López Galeiras
5cb5c7d42e Fix shfmt issues 2017-01-18 11:51:41 +01:00
Iago López Galeiras
43d9f38c5e Fix various linter issues
Found via shellcheck.
2017-01-18 11:51:41 +01:00
Alfonso Acosta
5433c256c7 Fix argument escaping in Scope
By naively using echo and cat to print to serialize/deserealize arguments we were garbling
arguments with special characters and whitespaces
2016-10-25 15:35:48 +00:00
Tom Wilkie
32edfc9112 Don't reencode reports in the collector (#1819)
* Don't reencode reports in the collector

* Review feedback

* Fix comment

* Update alpine URLs so it will build

* Fix tests
2016-08-22 17:37:41 +01:00
Paul Bellamy
691ad042c7 adding a demo json report to the scope dockerfile 2016-07-11 11:50:28 +01:00
Tom Wilkie
8e1a6b3667 Add dry run flag to scope, so when launched we can check the args are valid. (#1609)
* Add dry run flag to scope, so when launched we can check the args are valid.

* Try and parse listen address and error early.

* Specify that -dry-run is for internal use only.
2016-06-27 10:13:55 +01:00
Alfonso Acosta
4dfd096ca7 Fix handling of implicit probe targets
Also, clean up entrypoint script.
2016-06-15 11:12:50 +00:00
Alban Crequy
42ad3aa12b Scope slow: improve error messages for debugging (#1534)
* alpine: dl-4.alpinelinux.org is dead, use another server

* increase buffer for docker stats

Attempt to avoid the following message:
docker container: dropping stats.

* probe: better timeout error messages

The logs contains the following messages:

Process reporter took longer than 1s
K8s reporter took longer than 1s
Docker reporter took longer than 1s
Endpoint reporter took longer than 1s

This patch prints how long it takes.
2016-05-22 18:21:55 +01:00
Tom Wilkie
cb0901e8e1 Move all the flag parsing to main.go; implement scope help 2016-04-20 15:48:43 +01:00
Tom Wilkie
531e08210c Pin alpine version. 2016-03-23 15:41:37 +00:00
Tom Wilkie
7711fe06d9 Make --app-only run the app, not the probe. 2016-02-29 18:00:10 +00:00
Tom Wilkie
96830942ed Plumb through custom weave domains. 2016-02-25 19:39:08 +00:00
Paul Bellamy
d4c6280820 Review Feedback: Stick args in /var/run/weave 2016-02-12 15:51:17 +00:00
Paul Bellamy
217b68c764 overwrite /etc/weave/apps, because it might already exist 2016-02-12 13:54:49 +00:00
Tom Wilkie
d4e58b9e33 Decouple Scope lifecycle from Weave lifecycle
- Run the Weave integrations regardless of if weave is detected.
- Make everything backoff and not spam the logs.
- Add miekg dns to vendor.
- Have the app periodically register with weaveDNS, and the probe do lookups there.
- Decide what the local networks are at runtime, not once at startup.
- Correctly resolve app ids, fixes #825
2016-02-09 14:24:57 +00:00
Alfonso Acosta
3d94082b07 Add debug logging 2016-02-05 16:58:40 +00:00
Tom Wilkie
f8c720f266 Use exec -a to differentiate app and probe process names. 2016-01-06 11:56:09 +00:00
Alfonso Acosta
f183590cf4 [probe] Only target scope.weave.works implicitly if no app is provided 2015-12-21 17:00:23 +00:00
Alfonso Acosta
4841340b33 [probe] Use https with scope.weave.works by default 2015-12-21 14:48:27 +00:00
Tom Wilkie
667dd0f1de Rationalise version handling 2015-12-11 12:23:01 +00:00
Tom Wilkie
c749f5aa33 Merge probe and app binaries, run with ./scope probe or ./scope app. 2015-12-09 11:00:42 +00:00
Paul Bellamy
d57d4aa53a Don't default to ssl for scope.weave.works
It doesn't support it yet, and we want to release 0.10.0
2015-11-16 10:44:30 +00:00
Tom Wilkie
0288b3151b Use gocertifi instead of random ca-certs. 2015-10-23 16:35:41 +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
b77fbcdaf1 Make scope work with weave master. 2015-10-20 09:48:12 +00: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
Tom Wilkie
206a56b1ad Do all weave operations from within the container
Fixes #523
2015-09-30 11:54:38 +00:00
Peter Bourgon
36b743fe1f probe, app: reliable shutdown
- Restructure main funcs for clean defer-stack-unwinds
- Fix Docker container to handle signals properly
- Introduce runsvinit for container init process
- Integration test
2015-09-29 11:45:12 +02:00
Tom Wilkie
c92ee90716 Use alpine:latest instead of gliderlabs/alpine 2015-09-01 11:15:14 +00:00
Tom Wilkie
18cda35f73 Add works.weave.role=system label to the scope container. 2015-08-27 14:17:08 +00:00
Tom Wilkie
d8ac16d3f3 Gather container IP addresses from Docker and Weave, and apply them to nodes in the container topology. 2015-08-26 10:19:08 +00:00
Tom Wilkie
b4d7b88265 run.weave.works -> scope.weave.works 2015-08-14 16:58:01 +00:00
Tom Wilkie
6f3828a431 Add parameter shortcut for saas 2015-08-12 12:04:06 +00:00