Merge pull request #769 from rade/768_shorten_proxy_entrypoint

shorten proxy entrypoint
This commit is contained in:
Paul Bellamy committed 2015-05-28 12:16:24 +01:00
commit 4f89ad2342
2 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -16,7 +16,7 @@ import (
var (
containerIDRegexp = regexp.MustCompile("^/v[0-9\\.]*/containers/([^/]*)/.*")
weaveWaitEntrypoint = []string{"/home/weavewait/weavewait"}
weaveWaitEntrypoint = []string{"/w/w"}
)
func callWeave(args ...string) ([]byte, error) {
+2 -2
View File
@@ -16,9 +16,9 @@ WORKDIR /home/weave
ADD ./weave /home/weave/
ADD ./sigproxy /home/weave/
ADD ./weaveproxy /home/weave/
ADD ./weavewait /home/weavewait/weavewait
ADD ./weavewait /w/w
ADD ./docker.tgz /
VOLUME /home/weavewait
VOLUME /w
ENTRYPOINT ["/home/weave/sigproxy", "/home/weave/weave"]