From 00d28d11466ec77c9e919275c066d5454b7c0ea2 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Sat, 26 Mar 2016 08:34:17 +0800
Subject: [PATCH] update influxdb and grafana

---
 grafana/Dockerfile          | 10 +++++-----
 grafana/docker-compose.yml  |  8 ++++++++
 influxdb/Dockerfile         | 13 ++++++++-----
 influxdb/README.md          |  5 ++++-
 influxdb/docker-compose.yml |  7 +++++++
 5 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100644 grafana/docker-compose.yml
 create mode 100644 influxdb/docker-compose.yml

diff --git a/grafana/Dockerfile b/grafana/Dockerfile
index 97de66d..a0f8c15 100644
--- a/grafana/Dockerfile
+++ b/grafana/Dockerfile
@@ -5,9 +5,9 @@
 FROM debian:jessie
 MAINTAINER kev <noreply@datageek.info>
 
-ENV GRAFANA_VERSION=2.6.0 \
-    GRAFANA_FILE=grafana_${GRAFANA_VERSION}_amd64.deb \
-    GRAFANA_URL=https://grafanarel.s3.amazonaws.com/builds/${GRAFANA_FILE}
+ENV GRAFANA_VERSION=2.6.0
+ENV GRAFANA_FILE=grafana_${GRAFANA_VERSION}_amd64.deb
+ENV GRAFANA_URL=https://grafanarel.s3.amazonaws.com/builds/${GRAFANA_FILE}
 
 RUN set -xe \
     && apt-get update \
@@ -18,8 +18,8 @@ RUN set -xe \
     && rm -rf ${GRAFANA_FILE} \
               /var/lib/apt/lists/*
 
-ENV GF_PATHS_DATA=/var/lib/grafana \
-    GF_PATHS_LOGS=/var/log/grafana
+ENV GF_PATHS_DATA=/var/lib/grafana
+ENV GF_PATHS_LOGS=/var/log/grafana
 
 VOLUME /etc/grafana \
        $GF_PATHS_DATA \
diff --git a/grafana/docker-compose.yml b/grafana/docker-compose.yml
new file mode 100644
index 0000000..60d56e0
--- /dev/null
+++ b/grafana/docker-compose.yml
@@ -0,0 +1,8 @@
+grafana:
+  image: vimagick/grafana
+  ports:
+    - "3000:3000"
+  environment:
+    - GF_SECURITY_ADMIN_USER=admin
+    - GF_SECURITY_ADMIN_PASSWORD=ag2Ahth2u
+  restart: always
diff --git a/influxdb/Dockerfile b/influxdb/Dockerfile
index ae199bc..188de3c 100644
--- a/influxdb/Dockerfile
+++ b/influxdb/Dockerfile
@@ -5,13 +5,16 @@
 FROM debian:jessie
 MAINTAINER kev <noreply@datageek.info>
 
-ENV INFLUXDB_VER 0.9.6.1
-ENV INFLUXDB_FILE influxdb_${INFLUXDB_VER}_amd64.deb
-ENV INFLUXDB_URL https://s3.amazonaws.com/influxdb/${INFLUXDB_FILE}
+ENV INFLUXDB_VERSION=0.11.0
+ENV INFLUXDB_FILE=influxdb_${INFLUXDB_VERSION}-1_amd64.deb
+ENV INFLUXDB_MD5=917148cda9d88aad384475c236aaf81e
+ENV INFLUXDB_URL=https://s3.amazonaws.com/influxdb/${INFLUXDB_FILE}
 
-RUN apt-get update \
+RUN set -xe \
+    && apt-get update \
     && apt-get install -y wget \
-    && wget ${INFLUXDB_URL} \
+    && wget ${INFLUXDB_URL} -O ${INFLUXDB_FILE} \
+    && echo "${INFLUXDB_MD5}  ${INFLUXDB_FILE}" | md5sum -c \
     && dpkg -i ${INFLUXDB_FILE} \
     && sed -i '/^reporting-disabled/s/false/true/' /etc/influxdb/influxdb.conf \
     && apt-get purge --auto-remove -y wget \
diff --git a/influxdb/README.md b/influxdb/README.md
index 981a540..078df52 100644
--- a/influxdb/README.md
+++ b/influxdb/README.md
@@ -1,6 +1,9 @@
 influxdb
 ========
 
-`InfluxDB` is an open source distributed time series database with no external
+[InfluxDB][1] is an open source distributed time series database with no external
 dependencies. It's useful for recording metrics, events, and performing
 analytics.
+
+
+[1]: https://influxdata.com/
diff --git a/influxdb/docker-compose.yml b/influxdb/docker-compose.yml
new file mode 100644
index 0000000..ab1bd62
--- /dev/null
+++ b/influxdb/docker-compose.yml
@@ -0,0 +1,7 @@
+influxdb:
+  image: vimagick/influxdb
+  ports:
+    - "8083:8083"
+    - "8086:8086"
+    - "8088:8088"
+  restart: always