Merge pull request #3369 from bhavin192/cloud-agent-docker

Remove weaveutil and weave from Dockerfile.cloud-agent
This commit is contained in:
Bryan Boreham
2018-10-15 16:38:39 +01:00
committed by GitHub
2 changed files with 1 additions and 1 deletions

View File

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

View File

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