diff options
| author | Ole Mathias Heggem <ole@sdok.no> | 2017-04-19 23:16:07 +0200 |
|---|---|---|
| committer | Ole Mathias Heggem <ole@sdok.no> | 2017-04-19 23:16:07 +0200 |
| commit | 7b97188b728c85c498acc8acdce1750c472f2c85 (patch) | |
| tree | 12c1436ab7eb97e9434e774671e8ffea134d61db /build/test | |
| parent | f70f65f7466a480a45a8260b35887cb7ed36b466 (diff) | |
| parent | 7d404abf07d865d253ac2cfc353741e8d4af4867 (diff) | |
Merge remote-tracking branch 'refs/remotes/tech-server/master'
Diffstat (limited to 'build/test')
| -rw-r--r-- | build/test/gondul-grafana-test.Dockerfile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/build/test/gondul-grafana-test.Dockerfile b/build/test/gondul-grafana-test.Dockerfile index be808d3..1b26f3a 100644 --- a/build/test/gondul-grafana-test.Dockerfile +++ b/build/test/gondul-grafana-test.Dockerfile @@ -1,9 +1,9 @@ FROM grafana/grafana:4.0.0-beta2 -ENV GF_SERVER_ROOT_URL http://nms-dev.gathering.org/grafana/ +ENV GF_SERVER_ROOT_URL http://gondul.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_HOST cryptolocker.tg17.gathering.org:5432 ENV GF_DATABASE_NAME grafana ENV GF_DATABASE_USER grafana ENV GF_DATABASE_PASSWORD grafana @@ -11,6 +11,3 @@ 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-yes-I-knw -ENV GF_EXTERNAL_IMAGE_STORAGE_S3_SECRET_KEY dTuAqxPGE5SFbtEmJxoZ9Y3AHINOZ5ju0IPfoqfA-no-it-doesnt-work |