Skip to content

testutil: fixed compose files #3397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
obol-bulldozer merged 2 commits into from
Dec 3, 2024
+16 −14
Merged

testutil: fixed compose files #3397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84fad97
testutil: fixed compose files
pinebit Dec 3, 2024
e88ee14
Updated golden file
pinebit Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions testutil/compose/docker-compose.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
Expand All @@ -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 -}}
Expand All @@ -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
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions testutil/compose/static/loki/loki.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 7 additions & 6 deletions testutil/compose/testdata/TestDockerCompose_run_yml.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -226,7 +226,7 @@ services:


grafana:
image: grafana/grafana:latest
image: grafana/grafana:${GRAFANA_VERSION:-10.4.2}
ports:
- "3000:3000"
networks: [compose]
Expand All @@ -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
Expand All @@ -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:
Expand Down
Loading