From 84fad9771a55d3e439a0a89e87b8bf99890e2ffd Mon Sep 17 00:00:00 2001
From: Andrei Smirnov <andrei@obol.tech>
Date: Tue, 3 Dec 2024 15:00:21 +0300
Subject: [PATCH 1/2] testutil: fixed compose files

---
 testutil/compose/docker-compose.template | 13 +++++++------
 testutil/compose/static/loki/loki.yml    |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/testutil/compose/docker-compose.template b/testutil/compose/docker-compose.template
index c3bef57fd6..46816f7506 100644
--- a/testutil/compose/docker-compose.template
+++ b/testutil/compose/docker-compose.template
@@ -74,7 +74,7 @@ services:
     networks: [compose]
 
   prometheus:
-    image: prom/prometheus:latest
+    image: prom/prometheus:${PROMETHEUS_VERSION:-v2.50.1}
     {{if .MonitoringPorts}}ports:
       - "9090:9090"
     {{end -}}
@@ -86,7 +86,7 @@ services:
 
   {{if .Monitoring}}
   grafana:
-    image: grafana/grafana:latest
+    image: grafana/grafana:${GRAFANA_VERSION:-10.4.2}
     {{if .MonitoringPorts}}ports:
       - "3000:3000"
     {{end -}}
@@ -101,7 +101,7 @@ services:
       - ./grafana/dash_alerts.json:/etc/dashboards/dash_alerts.json
 
   jaeger:
-    image: jaegertracing/all-in-one:latest
+    image: jaegertracing/all-in-one:${JAEGER_VERSION:-1.46.0}
     networks: [compose]
     environment:
       SPAN_STORAGE_TYPE: memory
@@ -111,11 +111,12 @@ services:
     {{end}}
 
   loki:
-    image: grafana/loki:latest
+    image: grafana/loki:${LOKI_VERSION:-2.8.2}
     networks: [compose]
-    command: -config.file=/etc/loki/loki.yml
+    user: ":"
+    command: -config.file=/opt/loki/loki.yml
     volumes:
-      - ./loki/loki.yml:/etc/loki/loki.yml
+      - ./loki:/opt/loki
   {{end}}
 
 networks:
diff --git a/testutil/compose/static/loki/loki.yml b/testutil/compose/static/loki/loki.yml
index 4f3d703c50..1bdf3684c5 100644
--- a/testutil/compose/static/loki/loki.yml
+++ b/testutil/compose/static/loki/loki.yml
@@ -29,10 +29,10 @@ schema_config:
 
 storage_config:
   boltdb:
-    directory: /tmp/loki/index
+    directory: /opt/loki/index
 
   filesystem:
-    directory: /tmp/loki/chunks
+    directory: /opt/loki/chunks
 
 limits_config:
   enforce_metric_name: false

From e88ee148f3accb404eb9ba4db46bdb08d2430f47 Mon Sep 17 00:00:00 2001
From: Andrei Smirnov <andrei@obol.tech>
Date: Tue, 3 Dec 2024 15:08:38 +0300
Subject: [PATCH 2/2] Updated golden file

---
 .../testdata/TestDockerCompose_run_yml.golden       | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/testutil/compose/testdata/TestDockerCompose_run_yml.golden b/testutil/compose/testdata/TestDockerCompose_run_yml.golden
index 1ecf52642e..993857fd32 100644
--- a/testutil/compose/testdata/TestDockerCompose_run_yml.golden
+++ b/testutil/compose/testdata/TestDockerCompose_run_yml.golden
@@ -215,7 +215,7 @@ services:
     networks: [compose]
 
   prometheus:
-    image: prom/prometheus:latest
+    image: prom/prometheus:${PROMETHEUS_VERSION:-v2.50.1}
     ports:
       - "9090:9090"
     networks: [compose]
@@ -226,7 +226,7 @@ services:
 
   
   grafana:
-    image: grafana/grafana:latest
+    image: grafana/grafana:${GRAFANA_VERSION:-10.4.2}
     ports:
       - "3000:3000"
     networks: [compose]
@@ -240,7 +240,7 @@ services:
       - ./grafana/dash_alerts.json:/etc/dashboards/dash_alerts.json
 
   jaeger:
-    image: jaegertracing/all-in-one:latest
+    image: jaegertracing/all-in-one:${JAEGER_VERSION:-1.46.0}
     networks: [compose]
     environment:
       SPAN_STORAGE_TYPE: memory
@@ -250,11 +250,12 @@ services:
     
 
   loki:
-    image: grafana/loki:latest
+    image: grafana/loki:${LOKI_VERSION:-2.8.2}
     networks: [compose]
-    command: -config.file=/etc/loki/loki.yml
+    user: ":"
+    command: -config.file=/opt/loki/loki.yml
     volumes:
-      - ./loki/loki.yml:/etc/loki/loki.yml
+      - ./loki:/opt/loki
   
 
 networks: