Skip to content

Commit 3b050ef

Browse files
committed
feat(database): multi-platform support
1 parent 0cb0998 commit 3b050ef

2 files changed

Lines changed: 16 additions & 9 deletions

File tree

grafana/rootfs/Dockerfile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1+
FROM drycc/go-dev:latest AS go-dev
2+
3+
14
FROM grafana/grafana:7.3.4
25
USER root
36
COPY . /
7+
COPY --from=go-dev /bin/envtpl /home/influxdb/envtpl
48
RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
59
&& apk add --update bash fontconfig curl \
6-
&& curl -fsSL -o /usr/share/grafana/envtpl https://github.com/arschles/envtpl/releases/download/0.2.3/envtpl_linux_amd64 \
7-
&& chmod +x /usr/share/grafana/envtpl \
8-
&& chmod +x /usr/share/grafana/start-grafana \
9-
&& chmod 644 /usr/share/grafana/grafana.ini.tpl \
10-
&& chmod +x /usr/share/grafana/entrypoint.sh
10+
&& chmod +x /usr/share/grafana/start-grafana \
11+
&& chmod 644 /usr/share/grafana/grafana.ini.tpl \
12+
&& chmod +x /usr/share/grafana/entrypoint.sh
1113

1214
WORKDIR /usr/share/grafana
1315
ENTRYPOINT ["/usr/share/grafana/entrypoint.sh"]

telegraf/rootfs/Dockerfile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1+
FROM drycc/go-dev:latest AS go-dev
2+
3+
14
FROM telegraf:1.16.2
25

36
COPY . /
7+
COPY --from=go-dev /bin/envtpl /home/influxdb/envtpl
48

5-
RUN curl -fSL -o /usr/bin/envtpl https://github.com/arschles/envtpl/releases/download/0.2.3/envtpl_linux_amd64 \
6-
&& chmod +x /usr/bin/envtpl \
7-
&& curl -fSL -o /usr/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 \
8-
&& chmod +x /usr/bin/jq
9+
RUN apt-get update \
10+
&& apt-get install -y --no-install-recommends jq \
11+
&& apt-get autoremove -y \
12+
&& apt-get clean -y \
13+
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/man /usr/share/doc
914

1015
CMD ["/start-telegraf"]

0 commit comments

Comments
 (0)