Skip to content

Commit

Permalink
Use exec -a to differentiate app and probe process names.
Browse files Browse the repository at this point in the history
  • Loading branch information
tomwilkie committed Jan 6, 2016
1 parent e9e152b commit f8c720f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MAINTAINER Weaveworks Inc <[email protected]>
LABEL works.weave.role=system
WORKDIR /home/weave
RUN echo "http://dl-4.alpinelinux.org/alpine/edge/testing" >>/etc/apk/repositories && \
apk add --update runit conntrack-tools iproute2 util-linux curl && \
apk add --update bash runit conntrack-tools iproute2 util-linux curl && \
rm -rf /var/cache/apk/*
ADD ./docker.tgz /
ADD ./weave /usr/bin/
Expand Down
4 changes: 2 additions & 2 deletions docker/run-app
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh
#!/bin/bash

exec /home/weave/scope app $(cat /etc/weave/scope-app.args)
exec -a scope-app /home/weave/scope app $(cat /etc/weave/scope-app.args)
4 changes: 2 additions & 2 deletions docker/run-probe
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh
#!/bin/bash

exec /home/weave/scope probe $(cat /etc/weave/scope-probe.args) $(cat /etc/weave/apps)
exec -a scope-probe /home/weave/scope probe $(cat /etc/weave/scope-probe.args) $(cat /etc/weave/apps)

0 comments on commit f8c720f

Please sign in to comment.