NCP-3 add UserContent entity #5

Merged
backdev merged 29 commits from NCP-3 into dev 2025-12-05 17:58:17 +08:00
Showing only changes of commit 0696668790 - Show all commits
+23 -13
View File
@@ -13,11 +13,11 @@ services:
volumes: volumes:
- pgdata:/var/lib/postgresql/data - pgdata:/var/lib/postgresql/data
container_name: postgres container_name: postgres
networks:
- app-network
app: app:
# image: popovtsev/ncp build: .
build: .
container_name: no_copy_app container_name: no_copy_app
environment: environment:
POSTGRES_DB: no_copy_ POSTGRES_DB: no_copy_
@@ -29,7 +29,8 @@ services:
- db - db
ports: ports:
- "81:8080" - "81:8080"
networks:
- app-network
grafana: grafana:
image: grafana/grafana:10.3.1 image: grafana/grafana:10.3.1
@@ -58,7 +59,8 @@ services:
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 10 retries: 10
networks:
- app-network
prometheus: prometheus:
image: prom/prometheus:latest image: prom/prometheus:latest
@@ -72,7 +74,8 @@ services:
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 5 retries: 5
networks:
- app-network
loki: loki:
image: grafana/loki:2.9.2 image: grafana/loki:2.9.2
@@ -86,7 +89,8 @@ services:
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 5 retries: 5
networks:
- app-network
tempo: tempo:
image: grafana/tempo:2.4.1 image: grafana/tempo:2.4.1
@@ -97,16 +101,17 @@ services:
- tempo_data:/var/tempo - tempo_data:/var/tempo
ports: ports:
- "3200:3200" - "3200:3200"
networks:
- app-network
alloy: alloy:
image: grafana/alloy:latest image: grafana/alloy:latest
container_name: alloy container_name: alloy
user: root user: root
ports: ports:
- "9080:9080" # HTTP interface - "9080:9080"
- "4317:4317" # OTLP gRPC - "4317:4317"
- "4318:4318" # OTLP http - "4318:4318"
volumes: volumes:
- ./infrastructure/alloy/config.alloy:/etc/alloy/config.alloy:ro - ./infrastructure/alloy/config.alloy:/etc/alloy/config.alloy:ro
- /var/lib/docker/containers:/var/lib/docker/containers:ro - /var/lib/docker/containers:/var/lib/docker/containers:ro
@@ -119,7 +124,8 @@ services:
- --server.http.listen-addr=0.0.0.0:9080 - --server.http.listen-addr=0.0.0.0:9080
- --storage.path=/var/lib/alloy/data - --storage.path=/var/lib/alloy/data
- /etc/alloy/config.alloy - /etc/alloy/config.alloy
networks:
- app-network
volumes: volumes:
pgdata: pgdata:
@@ -128,4 +134,8 @@ volumes:
loki_data: loki_data:
loki_chunks: loki_chunks:
loki_index: loki_index:
loki_rules: loki_rules:
networks:
app-network:
driver: bridge