-
Notifications
You must be signed in to change notification settings - Fork 712
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use exec -a to differentiate app and probe process names.
- Loading branch information
Showing
3 changed files
with
5 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) |