From 9ff2c4191865b9d2aaabfac31ab6b5f1df47ddaf Mon Sep 17 00:00:00 2001
From: lijianguo <lijianguo@zhumengyuan.com>
Date: Tue, 1 Dec 2020 13:24:14 +0800
Subject: [PATCH] chore(grafana): use grafana docker image

---
 grafana/rootfs/Dockerfile                      | 2 +-
 grafana/rootfs/usr/share/grafana/entrypoint.sh | 3 +++
 telegraf/rootfs/Dockerfile                     | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 grafana/rootfs/usr/share/grafana/entrypoint.sh

diff --git a/grafana/rootfs/Dockerfile b/grafana/rootfs/Dockerfile
index 227fd90..041df01 100644
--- a/grafana/rootfs/Dockerfile
+++ b/grafana/rootfs/Dockerfile
@@ -4,7 +4,7 @@ FROM drycc/go-dev:latest AS go-dev
 FROM grafana/grafana:7.3.4
 USER root
 COPY . /
-COPY --from=go-dev /bin/envtpl /home/influxdb/envtpl
+COPY --from=go-dev /bin/envtpl /usr/share/grafana/envtpl
 RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
     && apk add --update bash fontconfig curl \
     && chmod +x /usr/share/grafana/start-grafana \
diff --git a/grafana/rootfs/usr/share/grafana/entrypoint.sh b/grafana/rootfs/usr/share/grafana/entrypoint.sh
new file mode 100644
index 0000000..5fc4448
--- /dev/null
+++ b/grafana/rootfs/usr/share/grafana/entrypoint.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec "$@"
diff --git a/telegraf/rootfs/Dockerfile b/telegraf/rootfs/Dockerfile
index fcd7b7b..8e272ac 100644
--- a/telegraf/rootfs/Dockerfile
+++ b/telegraf/rootfs/Dockerfile
@@ -4,7 +4,7 @@ FROM drycc/go-dev:latest AS go-dev
 FROM telegraf:1.16.2
 
 COPY . /
-COPY --from=go-dev /bin/envtpl /home/influxdb/envtpl
+COPY --from=go-dev /bin/envtpl /usr/bin/envtpl
 
 RUN apt-get update \
   && apt-get install -y --no-install-recommends jq \