From faea8e8b0f162aed9cc429389f83155d037d06dd Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Thu, 6 Apr 2017 09:35:06 +0100 Subject: [PATCH] kill grafana by pid --- root/etc/cont-init.d/50-grafana.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/root/etc/cont-init.d/50-grafana.sh b/root/etc/cont-init.d/50-grafana.sh index ae51130..fafd827 100644 --- a/root/etc/cont-init.d/50-grafana.sh +++ b/root/etc/cont-init.d/50-grafana.sh @@ -13,6 +13,7 @@ mkdir -p /config/etc/grafana /config/var/lib/grafana /config/var/log/grafana cp /etc/grafana/grafana.ini /config/etc/grafana /usr/sbin/grafana-server --homepath=/usr/share/grafana --config=/config/etc/grafana/grafana.ini cfg:default.paths.data=/config/var/lib/grafana cfg:default.paths.logs=/config/var/log/grafana 2>&1 & +GRAFANA_PID=$! until nc -z -v -w5 localhost 3000 < /dev/null; do sleep 1; done @@ -32,6 +33,5 @@ curl 'http://admin:admin@localhost:3000/api/datasources' \ DATASOURCE echo -kill `ps -ef | grep grafana-server | grep homepath | awk {'print $2'}` - -touch ${STAMP} \ No newline at end of file +kill ${GRAFANA_PID} +touch ${STAMP}