aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Lyngstol <kly@kly.no>2016-11-23 12:40:11 +0100
committerKristian Lyngstol <kly@kly.no>2016-11-23 12:40:11 +0100
commit5976e67e48b332ff2dd1b3471307c1503cdddb25 (patch)
treeac2480a805a2d459c6536a20c4b5db0d1392cc58
parent4f756e45b8393d4388af9bb3b7ee34d2ef79b46d (diff)
Use grafana 4.0.0-beta2
-rw-r--r--build/test/gondul-grafana-test.Dockerfile6
1 files changed, 3 insertions, 3 deletions
diff --git a/build/test/gondul-grafana-test.Dockerfile b/build/test/gondul-grafana-test.Dockerfile
index 223f8db..9a433df 100644
--- a/build/test/gondul-grafana-test.Dockerfile
+++ b/build/test/gondul-grafana-test.Dockerfile
@@ -1,4 +1,4 @@
-FROM grafana/grafana:4.0.0-beta1
+FROM grafana/grafana:4.0.0-beta2
ENV GF_SERVER_ROOT_URL http://nms-dev.gathering.org/grafana/
ENV GF_METRICS_GRAPHITE_ADDRESS graphite:2003
ENV GF_METRICS_GRAPHITE_PREFIX grafana.%(instance_name)s.
@@ -10,5 +10,5 @@ ENV GF_DATABASE_PASSWORD grafana
ENV GF_DATABASE_SSL_MODE require
ENV GF_EXTERNAL_IMAGE_STORAGE_PROVIDER internal
ENV GF_EXTERNAL_IMAGE_STORAGE_S3_BUCKET_URL http://grafana.situla.bitbit.net/
-ENV GF_EXTERNAL_IMAGE_STORAGE_S3_ACCESS_KEY 8KMMX9F3VZZ6MAZOGFF6
-ENV GF_EXTERNAL_IMAGE_STORAGE_S3_SECRET_KEY dTuAqxPGE5SFbtEmJxoZ9Y3AHINOZ5ju0IPfoqfA
+ENV GF_EXTERNAL_IMAGE_STORAGE_S3_ACCESS_KEY 8KMMX9F3VZZ6MAZOGFF6-yes-I-knw
+ENV GF_EXTERNAL_IMAGE_STORAGE_S3_SECRET_KEY dTuAqxPGE5SFbtEmJxoZ9Y3AHINOZ5ju0IPfoqfA-no-it-doesnt-work