Skip to content

Commit 9ff2c41

Browse files
lijianguoduanhongyi
authored andcommitted
chore(grafana): use grafana docker image
1 parent 3b050ef commit 9ff2c41

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

grafana/rootfs/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM drycc/go-dev:latest AS go-dev
44
FROM grafana/grafana:7.3.4
55
USER root
66
COPY . /
7-
COPY --from=go-dev /bin/envtpl /home/influxdb/envtpl
7+
COPY --from=go-dev /bin/envtpl /usr/share/grafana/envtpl
88
RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
99
&& apk add --update bash fontconfig curl \
1010
&& chmod +x /usr/share/grafana/start-grafana \
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
exec "$@"

telegraf/rootfs/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM drycc/go-dev:latest AS go-dev
44
FROM telegraf:1.16.2
55

66
COPY . /
7-
COPY --from=go-dev /bin/envtpl /home/influxdb/envtpl
7+
COPY --from=go-dev /bin/envtpl /usr/bin/envtpl
88

99
RUN apt-get update \
1010
&& apt-get install -y --no-install-recommends jq \

0 commit comments

Comments
 (0)