Merge branch '1.4'

This commit is contained in:
Matthias Radestock committed 2016-01-29 15:25:50 +00:00
commit b2c9802aa2
3 files changed
+10 -4

No files matched your search

-3
View File
@@ -4,9 +4,6 @@ MAINTAINER Weaveworks Inc <help@weave.works>
LABEL works.weave.role=system
WORKDIR /home/weave
VOLUME /w
VOLUME /w-noop
VOLUME /w-nomcast
ENTRYPOINT ["/home/weave/sigproxy", "/home/weave/weave"]
RUN apk add --update \