From 3be29a29af6b121b8a9fe6c8ba4ae33de62a0b77 Mon Sep 17 00:00:00 2001 From: kev Date: Wed, 1 Jun 2016 16:11:09 +0800 Subject: [PATCH] fix grafana plugins --- README.md | 2 ++ grafana/Dockerfile | 4 +++- grafana/README.md | 5 +++-- grafana/arm/Dockerfile | 4 +++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b02f4f2..8660bf4 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,7 @@ A collection of delicious docker recipes. - [x] fteproxy :+1: - [x] fteproxy-arm :+1: - [x] grafana +- [x] grafana-arm - [x] h2o - [x] httpbin :+1: - [x] hubot @@ -54,6 +55,7 @@ A collection of delicious docker recipes. - [x] hugo-arm - [x] hydra - [x] influxdb +- [x] influxdb-arm - [x] iptables - [x] jamapi - [x] jenkins-arm :beetle: diff --git a/grafana/Dockerfile b/grafana/Dockerfile index 37dd56e..fed8720 100644 --- a/grafana/Dockerfile +++ b/grafana/Dockerfile @@ -22,6 +22,7 @@ RUN set -xe \ ENV GF_PATHS_DATA=/var/lib/grafana ENV GF_PATHS_LOGS=/var/log/grafana +ENV GF_PATHS_PLUGINS=/var/lib/grafana/plugins VOLUME /etc/grafana \ $GF_PATHS_DATA \ @@ -32,4 +33,5 @@ EXPOSE 3000 CMD grafana-server --homepath=/usr/share/grafana \ --config=/etc/grafana/grafana.ini \ cfg:default.paths.data="$GF_PATHS_DATA" \ - cfg:default.paths.logs="$GF_PATHS_LOGS" + cfg:default.paths.logs="$GF_PATHS_LOGS" \ + cfg:default.paths.plugins="$GF_PATHS_PLUGINS" diff --git a/grafana/README.md b/grafana/README.md index afc2b0d..69579e1 100644 --- a/grafana/README.md +++ b/grafana/README.md @@ -25,9 +25,10 @@ grafana: ``` $ docker-compose up -d $ docker-compose exec grafana bash ->>> cd /etc/grafana ->>> cat grafana.ini +>>> cat /etc/grafana/grafana.ini +>>> grafana-cli plugins install grafana-worldmap-panel >>> exit +$ docker-compose restart $ firefox http://localhost:3000/ ``` diff --git a/grafana/arm/Dockerfile b/grafana/arm/Dockerfile index f2551d6..21af7cd 100644 --- a/grafana/arm/Dockerfile +++ b/grafana/arm/Dockerfile @@ -22,6 +22,7 @@ RUN set -xe \ ENV GF_PATHS_DATA=/var/lib/grafana ENV GF_PATHS_LOGS=/var/log/grafana +ENV GF_PATHS_PLUGINS=/var/lib/grafana/plugins VOLUME /etc/grafana \ $GF_PATHS_DATA \ @@ -32,4 +33,5 @@ EXPOSE 3000 CMD grafana-server --homepath=/usr/share/grafana \ --config=/etc/grafana/grafana.ini \ cfg:default.paths.data="$GF_PATHS_DATA" \ - cfg:default.paths.logs="$GF_PATHS_LOGS" + cfg:default.paths.logs="$GF_PATHS_LOGS" \ + cfg:default.paths.plugins="$GF_PATHS_PLUGINS"