compose update

This commit is contained in:
2026-04-22 10:27:11 +07:00
parent 4057d039b8
commit efcfcd6c6e
+15 -2
View File
@@ -11,6 +11,8 @@ services:
condition: service_healthy condition: service_healthy
redis: redis:
condition: service_healthy condition: service_healthy
networks:
- netrunner_grid
db: db:
image: postgres:16-alpine image: postgres:16-alpine
@@ -22,11 +24,12 @@ services:
volumes: volumes:
- netrunner_db_data:/var/lib/postgresql/data - netrunner_db_data:/var/lib/postgresql/data
healthcheck: healthcheck:
# Теперь берет имена из .env
test: ["CMD-SHELL", "pg_isready -U ${DB_USER} -d ${DB_NAME}"] test: ["CMD-SHELL", "pg_isready -U ${DB_USER} -d ${DB_NAME}"]
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 5 retries: 5
networks:
- netrunner_grid
redis: redis:
image: redis:7-alpine image: redis:7-alpine
@@ -34,6 +37,8 @@ services:
healthcheck: healthcheck:
test: ["CMD", "redis-cli", "ping"] test: ["CMD", "redis-cli", "ping"]
interval: 5s interval: 5s
networks:
- netrunner_grid
prometheus: prometheus:
image: prom/prometheus:latest image: prom/prometheus:latest
@@ -43,6 +48,8 @@ services:
ports: ports:
- "127.0.0.1:9090:9090" - "127.0.0.1:9090:9090"
restart: always restart: always
networks:
- netrunner_grid
grafana: grafana:
image: grafana/grafana:latest image: grafana/grafana:latest
@@ -50,7 +57,6 @@ services:
ports: ports:
- "127.0.0.1:3030:3000" - "127.0.0.1:3030:3000"
environment: environment:
# Сразу задаем секьюрный пароль админа, чтобы никто не зашел в твой дашборд
- GF_SECURITY_ADMIN_USER=admin - GF_SECURITY_ADMIN_USER=admin
- GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD:-netrunner_admin_2026} - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD:-netrunner_admin_2026}
volumes: volumes:
@@ -58,6 +64,13 @@ services:
depends_on: depends_on:
- prometheus - prometheus
restart: always restart: always
networks:
- netrunner_grid
# Описываем сеть явно, чтобы включить надежный DNS-резолвер Docker
networks:
netrunner_grid:
driver: bridge
volumes: volumes:
netrunner_db_data: netrunner_db_data: