Skip to content

Commit

Permalink
Clean up Dockerfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
gruebel committed Oct 27, 2018
1 parent 3be8cf7 commit 27a8bf1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
3 changes: 1 addition & 2 deletions docker/Dockerfile.cloud-agent
Original file line number Diff line number Diff line change
@@ -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"]

Expand Down
7 changes: 3 additions & 4 deletions docker/Dockerfile.scope
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 27a8bf1

Please sign in to comment.