In Docker, {app,probe} -> {scope-app,scope-probe}

This commit is contained in:
Peter Bourgon
2015-06-29 18:45:03 +02:00
parent 69785493ba
commit ea9eaae26a
6 changed files with 11 additions and 9 deletions

View File

@@ -4,7 +4,7 @@ WORKDIR /home/weave
RUN echo "http://dl-4.alpinelinux.org/alpine/edge/testing" >>/etc/apk/repositories && \
apk add --update runit conntrack-tools && \
rm -rf /var/cache/apk/*
COPY ./app ./probe ./entrypoint.sh /home/weave/
COPY ./scope-app ./scope-probe ./entrypoint.sh /home/weave/
COPY ./run-app /etc/service/app/run
COPY ./run-probe /etc/service/probe/run
EXPOSE 4040

View File

@@ -44,8 +44,8 @@ while true; do
done
mkdir -p /etc/weave
echo "$APP_ARGS" >/etc/weave/app.args
echo "$PROBE_ARGS" >/etc/weave/probe.args
echo "$APP_ARGS" >/etc/weave/scope-app.args
echo "$PROBE_ARGS" >/etc/weave/scope-probe.args
if [ -n "$DNS_SERVER" -a -n "$SEARCHPATH" ]; then
echo "domain $SEARCHPATH" >/etc/resolv.conf

View File

@@ -1,3 +1,3 @@
#!/bin/sh
exec /home/weave/app $(cat /etc/weave/app.args) $(cat /etc/weave/probes)
exec /home/weave/scope-app $(cat /etc/weave/scope-app.args) $(cat /etc/weave/probes)

View File

@@ -1,3 +1,3 @@
#!/bin/sh
exec /home/weave/probe $(cat /etc/weave/probe.args)
exec /home/weave/scope-probe $(cat /etc/weave/probe.args)