From 0b3e5da834c5994b6289170827d660de6a987e23 Mon Sep 17 00:00:00 2001
From: Jonathan Lee <jonjohn1232009@gmail.com>
Date: Fri, 6 May 2016 17:00:56 -0400
Subject: [PATCH] #908 - Replacing scripts for testing grafana, graphite, and
 influxdb with docker-compose.yml (#910)

---
 tools/docker-compose.yml | 28 ++++++++++++++++++++++++++++
 tools/graphite.sh        |  6 ------
 tools/influxdb.sh        |  6 ------
 3 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 tools/docker-compose.yml
 delete mode 100755 tools/graphite.sh
 delete mode 100755 tools/influxdb.sh

diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml
new file mode 100644
index 000000000..f5f4667dd
--- /dev/null
+++ b/tools/docker-compose.yml
@@ -0,0 +1,28 @@
+version: '2'
+services:
+    grafana:
+        image: grafana/grafana
+        depends_on:
+            - graphite
+            - influxdb
+        links:
+            - graphite
+            - influxdb
+        ports:
+            - "3000:3000"
+    graphite:
+        image: sitespeedio/graphite
+        ports:
+            - "2003:2003"
+            - "8080:80"
+    influxdb:
+        image: tutum/influxdb
+        environment:
+            - PRE_CREATE_DB="sitespeed"
+            - ADMIN_USER="root"
+            - INFLUXDB_INIT_PWD="root"
+        ports:
+            - "8083:8083"
+            - "8086:8086"
+            - "8090:8090"
+            - "8099:8099"
diff --git a/tools/graphite.sh b/tools/graphite.sh
deleted file mode 100755
index f52cdf334..000000000
--- a/tools/graphite.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash -e
-
-# Start local Graphite and Grafana instances, for testing Graphite reporting
-
-docker run -d -p 8080:80 -p 2003:2003 sitespeedio/graphite
-docker run -d -p 3000:3000 grafana/grafana
diff --git a/tools/influxdb.sh b/tools/influxdb.sh
deleted file mode 100755
index 4fe1a671e..000000000
--- a/tools/influxdb.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash -e
-
-# Start local InfluxDB and Grafana instances, for testing InfluxDB reporting
-#  -e ADMIN_USER="root" -e INFLUXDB_INIT_PWD="root"
-docker run -d -p 8083:8083 -p 8086:8086 --expose 8090 --expose 8099 -e PRE_CREATE_DB="sitespeed" tutum/influxdb
-docker run -d -p 3000:3000 grafana/grafana