From 98c2b64b50c509f34a5cf847ac143728899c11d8 Mon Sep 17 00:00:00 2001
From: Roman Pertl <533172+roock@users.noreply.github.com>
Date: Thu, 2 Feb 2023 07:46:39 +0100
Subject: [PATCH] Use latest Grafana Container Images (#1227)

additionally allow oeverride grafana version in .env file

The default docker-compose file should not use a grafan version several
months old.
This uses the same logic as the development docker-compose file.

## Checklist

- [ ] Tests updated
- [ ] Documentation added
- [ ] `CHANGELOG.md` updated

Co-authored-by: Joey Orlando <joey.orlando@grafana.com>
---
 docker-compose-mysql-rabbitmq.yml | 2 +-
 docker-compose.yml                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose-mysql-rabbitmq.yml b/docker-compose-mysql-rabbitmq.yml
index 2468fa39..27015cf7 100644
--- a/docker-compose-mysql-rabbitmq.yml
+++ b/docker-compose-mysql-rabbitmq.yml
@@ -131,7 +131,7 @@ services:
       - with_grafana
 
   grafana:
-    image: "grafana/grafana:9.0.0-beta3"
+    image: "grafana/grafana:${GRAFANA_VERSION:-latest}"
     restart: always
     ports:
       - "3000:3000"
diff --git a/docker-compose.yml b/docker-compose.yml
index 6fa7cd67..1dcdfc61 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -73,7 +73,7 @@ services:
       retries: 10
 
   grafana:
-    image: "grafana/grafana:9.0.0-beta3"
+    image: "grafana/grafana:${GRAFANA_VERSION:-latest}"
     restart: always
     ports:
       - "3000:3000"