Merge pull request #3411 from gruebel/master

Clean up Dockerfiles
weaveworks · Nov 6, 2018 · a5d29a9 · a5d29a9
2 parents 5798d04 + 27a8bf1
commit a5d29a9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/docker/Dockerfile.cloud-agent b/docker/Dockerfile.cloud-agent
@@ -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"]
 

diff --git a/docker/Dockerfile.scope b/docker/Dockerfile.scope
@@ -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