Merge proxy and router/weaver processes.

Note: we no longer need to detect awsvpc when launching.
The "AWS VPC" mode is now set via the `--awsvpc` flag.
Before we had to "detect" it when the proxy was potentially started
later, after the router had started.

We drop WEAVEPROXY_DOCKER_ARGS as obsolete.
This commit is contained in:
Marc CARRE authored and Bryan Boreham committed 2017-05-10 10:25:23 +00:00
1 parent ccac18b21c
commit b654ac178c
8 files changed
+123 -243

No files matched your search

+1 -1
View File
@@ -25,7 +25,7 @@ RUN apk add --update \
bind-tools \
&& rm -rf /var/cache/apk/*
ADD ./weave ./sigproxy ./weaveproxy ./symlink /home/weave/
ADD ./weave ./sigproxy ./symlink /home/weave/
ADD ./weaveutil ./docker /usr/bin/
ADD ./weavewait /w/w
ADD ./weavewait_noop /w-noop/w