From 9c2fe36c0e1436df2c8f19b21244b6e1456b6c9c Mon Sep 17 00:00:00 2001 From: Bhavin Gandhi Date: Tue, 2 Oct 2018 10:59:51 +0530 Subject: [PATCH] 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 --- docker/Dockerfile.cloud-agent | 1 - docker/Dockerfile.scope | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.cloud-agent b/docker/Dockerfile.cloud-agent index 627fcfa2b..8f7434854 100644 --- a/docker/Dockerfile.cloud-agent +++ b/docker/Dockerfile.cloud-agent @@ -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"] diff --git a/docker/Dockerfile.scope b/docker/Dockerfile.scope index 9f2dc2851..7e0af4571 100644 --- a/docker/Dockerfile.scope +++ b/docker/Dockerfile.scope @@ -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