Skip to content

Commit 132a3c5

Browse files
committed
Update dependencies, code and docs
1 parent 47e584b commit 132a3c5

24 files changed

+885
-102
lines changed

.github/workflows/build.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ name: Build and Push Docker Images
22

33
on:
44
workflow_dispatch:
5+
push:
6+
branches:
7+
- main
8+
paths:
9+
- 'fastapi_app/**'
510

611
jobs:
712
build-and-push:
@@ -20,7 +25,7 @@ jobs:
2025
username: ${{ github.actor }}
2126
password: ${{ secrets.REGISTRY_TOKEN }}
2227

23-
- name: Build and push Spring Boot image
28+
- name: Build and push Container image
2429
uses: docker/build-push-action@v2
2530
with:
2631
context: ./fastapi_app

docker-compose.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@ x-logging: &default-logging
99
- regex:
1010
expression: '^(?P<time>\d{4}-\d{2}-\d{2} \d{1,2}:\d{2}:\d{2},\d{3}) (?P<message>(?s:.*))$$'
1111
12-
version: "3.4"
13-
1412
services:
1513
loki:
16-
image: grafana/loki:3.0.0
14+
image: grafana/loki:3.5.0
1715
command: -config.file=/etc/loki/local-config.yaml
1816
ports:
1917
- "3100:3100"
@@ -52,7 +50,7 @@ services:
5250
logging: *default-logging
5351

5452
prometheus:
55-
image: prom/prometheus:v2.51.2
53+
image: prom/prometheus:v3.3.1
5654
ports:
5755
- "9090:9090"
5856
volumes:
@@ -65,17 +63,19 @@ services:
6563
logging: *default-logging
6664

6765
tempo:
68-
image: grafana/tempo:2.4.1
69-
command: [ "--target=all", "--storage.trace.backend=local", "--storage.trace.local.path=/var/tempo", "--auth.enabled=false" ]
66+
image: grafana/tempo:2.7.2
67+
command: [ "-config.file=/etc/tempo.yml", "--target=all", "--storage.trace.backend=local", "--storage.trace.local.path=/var/tempo", "--auth.enabled=false" ]
7068
ports:
7169
- "4317:4317"
7270
- "4318:4318"
71+
volumes:
72+
- ./etc/tempo/tempo.yml:/etc/tempo.yml
7373
depends_on:
7474
- loki
7575
logging: *default-logging
7676

7777
grafana:
78-
image: grafana/grafana:10.4.2
78+
image: grafana/grafana:12.0.0
7979
ports:
8080
- "3000:3000"
8181
volumes:

0 commit comments

Comments
 (0)