diff options
| author | Lasse Haugen <haugen.lasse@gmail.com> | 2016-12-16 13:02:26 +0100 |
|---|---|---|
| committer | Lasse Haugen <haugen.lasse@gmail.com> | 2016-12-16 13:02:26 +0100 |
| commit | 8c4fe3a787a1f95e81cdd3e36d66f45115d3322f (patch) | |
| tree | b8b3ed907ff634fae047c010d2233cba5598e829 /build/test/gondul-grafana-test.Dockerfile | |
| parent | 64e91a665adc3eef4692db80ca98c4f6de29895a (diff) | |
| parent | fdfb87ee3fe4166f49aae9349e57ab007bbe0932 (diff) | |
Merge branch 'master' of github.com:tech-server/gondul
Diffstat (limited to 'build/test/gondul-grafana-test.Dockerfile')
| -rw-r--r-- | build/test/gondul-grafana-test.Dockerfile | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/build/test/gondul-grafana-test.Dockerfile b/build/test/gondul-grafana-test.Dockerfile index 33c69b4..be808d3 100644 --- a/build/test/gondul-grafana-test.Dockerfile +++ b/build/test/gondul-grafana-test.Dockerfile @@ -1,8 +1,16 @@ -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. +ENV GF_DATABASE_TYPE postgres +ENV GF_DATABASE_HOST db:5432 +ENV GF_DATABASE_NAME grafana +ENV GF_DATABASE_USER grafana +ENV GF_DATABASE_PASSWORD grafana +ENV GF_DATABASE_SSL_MODE require +ENV GF_AUTH_PROXY_ENABLED true +ENV GF_AUTH_DISABLE_LOGIN_FORM true 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 |