Merge pull request #36 from nickbabcock/latest-tagdb

Update to latest graphite in integration tests

ci/Dockerfile.graphite

@@ -1,2 +0,0 @@
-FROM graphiteapp/graphite-statsd:1.1.4-10
-COPY local_settings.py /opt/graphite/webapp/graphite/

ci/local_settings.py

@@ -1,17 +0,0 @@
-TAGDB = 'graphite.tags.redis.RedisTagDB'
-TAGDB_REDIS_HOST = 'redis'
-TAGDB_REDIS_PORT = 6379
-TAGDB_REDIS_DB = 0
-
-### FROM GRAPHITE DOCKER
-
-import os
-
-LOG_DIR = '/var/log/graphite'
-SECRET_KEY = '$(date +%s | sha256sum | base64 | head -c 64)'
-
-if (os.getenv("MEMCACHE_HOST") is not None):
-    MEMCACHE_HOSTS = os.getenv("MEMCACHE_HOST").split(",")
-
-if (os.getenv("DEFAULT_CACHE_DURATION") is not None):
-    DEFAULT_CACHE_DURATION = int(os.getenv("CACHE_DURATION"))

docker-compose.yml

@@ -6,14 +6,10 @@ services:
       INFLUXDB_DB: "mydb"
       INFLUXDB_USER: "my_user"
       INFLUXDB_USER_PASSWORD: "my_pass"
-  redis:
-    image: redis:alpine
   graphite:
-    build:
-      dockerfile: Dockerfile.graphite
-      context: ci
-    depends_on:
-      - redis
+    image: graphiteapp/graphite-statsd
+    environment:
+      REDIS_TAGDB: "y"
   timescale:
     build:
       dockerfile: ci/Dockerfile.timescale