github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-16 03:49:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3411 from gruebel/master

Browse Source 
Clean up Dockerfiles
This commit is contained in:
Bryan Boreham
2018-11-06 08:44:03 +00:00
committed by GitHub
parent 5798d049df 27a8bf1008
commit a5d29a9a58
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docker/Dockerfile.cloud-agent
View File

@@ -1,7 +1,6 @@
FROM alpine:3.7
WORKDIR /home/weave
RUN apk add --update bash conntrack-tools iproute2 util-linux curl && \
rm -rf /var/cache/apk/*
RUN apk add --no-cache bash conntrack-tools iproute2 util-linux curl
COPY ./scope /home/weave/
ENTRYPOINT ["/home/weave/scope", "--mode=probe", "--no-app", "--probe.docker=true"]

7
docker/Dockerfile.scope
View File

@@ -1,8 +1,7 @@
FROM weaveworks/cloud-agent
RUN apk add --update runit && \
rm -rf /var/cache/apk/*
ADD ./demo.json /
ADD ./weave ./weaveutil /usr/bin/
RUN apk add --no-cache runit
COPY ./demo.json /
COPY ./weave ./weaveutil /usr/bin/
COPY ./runsvinit ./entrypoint.sh /home/weave/
COPY ./run-app /etc/service/app/run
COPY ./run-probe /etc/service/probe/run