From 1572d51aa08c103834d9a968f295afc8953b9755 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Wed, 1 Jun 2016 13:00:49 +0800
Subject: [PATCH] upgrade grafana to 3.0.4

---
 grafana/Dockerfile             |  2 +-
 grafana/README.md              |  3 ++-
 grafana/arm/Dockerfile         | 35 ++++++++++++++++++++++++++++++++++
 grafana/arm/docker-compose.yml |  9 +++++++++
 grafana/docker-compose.yml     |  1 +
 5 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 grafana/arm/Dockerfile
 create mode 100644 grafana/arm/docker-compose.yml

diff --git a/grafana/Dockerfile b/grafana/Dockerfile
index 2fb6b23..37dd56e 100644
--- a/grafana/Dockerfile
+++ b/grafana/Dockerfile
@@ -5,7 +5,7 @@
 FROM debian:jessie
 MAINTAINER kev <noreply@easypi.info>
 
-ENV GRAFANA_VERSION=3.0.1
+ENV GRAFANA_VERSION=3.0.4-1464167696
 ENV GRAFANA_FILE=grafana_${GRAFANA_VERSION}_amd64.deb
 ENV GRAFANA_URL=https://grafanarel.s3.amazonaws.com/builds/${GRAFANA_FILE}
 
diff --git a/grafana/README.md b/grafana/README.md
index 046794c..afc2b0d 100644
--- a/grafana/README.md
+++ b/grafana/README.md
@@ -14,6 +14,7 @@ grafana:
   ports:
     - "3000:3000"
   environment:
+    - GF_SERVER_ROOT_URL=http://grafana.easypi.info/
     - GF_SECURITY_ADMIN_USER=admin
     - GF_SECURITY_ADMIN_PASSWORD=admin
   restart: always
@@ -27,7 +28,7 @@ $ docker-compose exec grafana bash
 >>> cd /etc/grafana
 >>> cat grafana.ini
 >>> exit
-$ firefox http://localhost:3000
+$ firefox http://localhost:3000/
 ```
 
 [1]: http://grafana.org/
diff --git a/grafana/arm/Dockerfile b/grafana/arm/Dockerfile
new file mode 100644
index 0000000..f2551d6
--- /dev/null
+++ b/grafana/arm/Dockerfile
@@ -0,0 +1,35 @@
+#
+# Dockerfile for grafana-arm
+#
+
+FROM resin/rpi-raspbian:jessie
+MAINTAINER kev <noreply@easypi.info>
+
+ENV GRAFANA_VERSION=3.0.4-1464202710
+ENV GRAFANA_FILE=grafana_${GRAFANA_VERSION}_armhf.deb
+ENV GRAFANA_URL=https://github.com/vimagick/rpi-bin/raw/master/deb/${GRAFANA_FILE}
+
+RUN set -xe \
+    && apt-get update \
+    && apt-get install -y ca-certificates \
+                          libfontconfig \
+                          wget \
+    && wget ${GRAFANA_URL} \
+    && dpkg -i ${GRAFANA_FILE} \
+    && apt-get purge --auto-remove -y wget \
+    && rm -rf ${GRAFANA_FILE} \
+              /var/lib/apt/lists/*
+
+ENV GF_PATHS_DATA=/var/lib/grafana
+ENV GF_PATHS_LOGS=/var/log/grafana
+
+VOLUME /etc/grafana \
+       $GF_PATHS_DATA \
+       $GF_PATHS_LOGS
+
+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"
diff --git a/grafana/arm/docker-compose.yml b/grafana/arm/docker-compose.yml
new file mode 100644
index 0000000..2654aa2
--- /dev/null
+++ b/grafana/arm/docker-compose.yml
@@ -0,0 +1,9 @@
+grafana:
+  image: easypi/grafana-arm
+  ports:
+    - "3000:3000"
+  environment:
+    - GF_SERVER_ROOT_URL=http://grafana.easypi.info/
+    - GF_SECURITY_ADMIN_USER=admin
+    - GF_SECURITY_ADMIN_PASSWORD=admin
+  restart: always
diff --git a/grafana/docker-compose.yml b/grafana/docker-compose.yml
index 522346d..b44864b 100644
--- a/grafana/docker-compose.yml
+++ b/grafana/docker-compose.yml
@@ -3,6 +3,7 @@ grafana:
   ports:
     - "3000:3000"
   environment:
+    - GF_SERVER_ROOT_URL=http://grafana.easypi.info/
     - GF_SECURITY_ADMIN_USER=admin
     - GF_SECURITY_ADMIN_PASSWORD=admin
   restart: always