From f8c720f2665d637bc651f74e29f9ce932f708592 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Wed, 6 Jan 2016 11:56:09 +0000 Subject: [PATCH] Use exec -a to differentiate app and probe process names. --- docker/Dockerfile | 2 +- docker/run-app | 4 ++-- docker/run-probe | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 8744813df..d43583ad0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER Weaveworks Inc 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/ diff --git a/docker/run-app b/docker/run-app index b3caffc51..9426a1f31 100755 --- a/docker/run-app +++ b/docker/run-app @@ -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) diff --git a/docker/run-probe b/docker/run-probe index ef8022c9b..3553720fc 100755 --- a/docker/run-probe +++ b/docker/run-probe @@ -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)