forked from mtusi2026/mtusi2026lab4
feat: Саватеев А трек 4
This commit is contained in:
+133
-6
@@ -1,11 +1,10 @@
|
||||
name: messenger-lab3
|
||||
name: messenger-lab4
|
||||
|
||||
# Один образ приложения для api, migrate, s3-bootstrap и janitor. Собирает его
|
||||
# только api: параллельная сборка одного тега несколькими сервисами конфликтует.
|
||||
x-app: &app
|
||||
build:
|
||||
context: .
|
||||
args:
|
||||
APP_REVISION: ${APP_REVISION:-dev}
|
||||
image: mtusi-messenger:lab3
|
||||
image: mtusi-messenger:lab4
|
||||
pull_policy: never
|
||||
env_file:
|
||||
- .env
|
||||
environment: &app-network
|
||||
@@ -13,6 +12,7 @@ x-app: &app
|
||||
DB_PORT: "5432"
|
||||
VALKEY_HOST: valkey
|
||||
VALKEY_PORT: "6379"
|
||||
S3_ENDPOINT: http://s3:9000
|
||||
|
||||
x-api-resources: &api-resources
|
||||
resources:
|
||||
@@ -29,13 +29,20 @@ x-api: &api
|
||||
depends_on:
|
||||
migrate:
|
||||
condition: service_completed_successfully
|
||||
s3-bootstrap:
|
||||
condition: service_completed_successfully
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
valkey:
|
||||
condition: service_started
|
||||
# Только ограниченные ключи своего bucket; административных у API нет
|
||||
secrets:
|
||||
- s3_access_key_id
|
||||
- s3_secret_access_key
|
||||
networks:
|
||||
- edge
|
||||
- backend
|
||||
- storage
|
||||
healthcheck:
|
||||
test: ["CMD", "python", "src/healthcheck.py"]
|
||||
interval: 5s
|
||||
@@ -74,6 +81,10 @@ services:
|
||||
|
||||
api:
|
||||
<<: *api
|
||||
build:
|
||||
context: .
|
||||
args:
|
||||
APP_REVISION: ${APP_REVISION:-dev}
|
||||
deploy:
|
||||
<<: *api-resources
|
||||
replicas: ${API_REPLICAS:-2}
|
||||
@@ -149,6 +160,105 @@ services:
|
||||
cpus: "0.25"
|
||||
memory: 96M
|
||||
|
||||
# SeaweedFS всё-в-одном. master, volume, filer и их веб-интерфейсы слушают
|
||||
# только loopback контейнера; в сеть storage открыт лишь S3 API (9000).
|
||||
# Порты наружу не публикуются: bucket доступен только через API.
|
||||
s3:
|
||||
image: chrislusf/seaweedfs:4.48
|
||||
restart: unless-stopped
|
||||
command:
|
||||
- server
|
||||
- -dir=/data
|
||||
- -ip=127.0.0.1
|
||||
- -ip.bind=127.0.0.1
|
||||
- -master.volumeSizeLimitMB=1024
|
||||
- -volume.max=0
|
||||
- -s3
|
||||
- -s3.port=9000
|
||||
- -s3.ip.bind=0.0.0.0
|
||||
- -s3.config=/run/secrets/s3_identities
|
||||
- -s3.port.iceberg=0
|
||||
- -s3.port.lance=0
|
||||
# Тела загрузок SeaweedFS держит в памяти: без лимита 20 одновременных
|
||||
# PUT по 9 MiB вызывали OOM kill weed (evidence/experiment-uploads.json).
|
||||
# Сверх лимита запросы ждут своей очереди.
|
||||
- -s3.concurrentUploadLimitMB=128
|
||||
- -volume.concurrentUploadLimitMB=128
|
||||
environment:
|
||||
# Мягкий предел кучи Go ниже лимита контейнера: GC срабатывает раньше OOM
|
||||
GOMEMLIMIT: 384MiB
|
||||
secrets:
|
||||
- s3_identities
|
||||
volumes:
|
||||
- s3_data:/data
|
||||
networks:
|
||||
- storage
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "-q", "-O", "/dev/null", "http://127.0.0.1:9000/healthz"]
|
||||
interval: 2s
|
||||
timeout: 3s
|
||||
retries: 30
|
||||
start_period: 10s
|
||||
stop_grace_period: 30s
|
||||
deploy:
|
||||
resources:
|
||||
limits:
|
||||
cpus: "1.0"
|
||||
memory: 512M
|
||||
|
||||
# Идемпотентное создание приватного bucket административными ключами
|
||||
s3-bootstrap:
|
||||
<<: *app
|
||||
command: ["python", "src/s3_bootstrap.py"]
|
||||
restart: "no"
|
||||
depends_on:
|
||||
s3:
|
||||
condition: service_healthy
|
||||
secrets:
|
||||
- s3_admin_access_key_id
|
||||
- s3_admin_secret_access_key
|
||||
networks:
|
||||
- storage
|
||||
healthcheck:
|
||||
disable: true
|
||||
deploy:
|
||||
resources:
|
||||
limits:
|
||||
cpus: "0.5"
|
||||
memory: 256M
|
||||
|
||||
# Сверка S3/БД: незавершённые загрузки старше grace period и сироты
|
||||
janitor:
|
||||
<<: *app
|
||||
command: ["python", "src/janitor.py"]
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
migrate:
|
||||
condition: service_completed_successfully
|
||||
s3-bootstrap:
|
||||
condition: service_completed_successfully
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
secrets:
|
||||
- s3_access_key_id
|
||||
- s3_secret_access_key
|
||||
networks:
|
||||
- backend
|
||||
- storage
|
||||
healthcheck:
|
||||
test: ["CMD", "python", "src/healthcheck.py", "janitor"]
|
||||
interval: 30s
|
||||
timeout: 5s
|
||||
retries: 3
|
||||
start_period: 30s
|
||||
start_interval: 1s
|
||||
stop_grace_period: 10s
|
||||
deploy:
|
||||
resources:
|
||||
limits:
|
||||
cpus: "0.25"
|
||||
memory: 192M
|
||||
|
||||
api-short-ttl:
|
||||
<<: *api
|
||||
profiles:
|
||||
@@ -164,6 +274,23 @@ networks:
|
||||
edge: {}
|
||||
backend:
|
||||
internal: true
|
||||
# API, janitor и bootstrap ↔ S3; PostgreSQL и Valkey сюда не входят
|
||||
storage:
|
||||
internal: true
|
||||
|
||||
volumes:
|
||||
postgres_data:
|
||||
s3_data:
|
||||
|
||||
# Создаются scripts/init-secrets.sh; в git не попадают
|
||||
secrets:
|
||||
s3_access_key_id:
|
||||
file: ./secrets/s3_access_key_id
|
||||
s3_secret_access_key:
|
||||
file: ./secrets/s3_secret_access_key
|
||||
s3_admin_access_key_id:
|
||||
file: ./secrets/s3_admin_access_key_id
|
||||
s3_admin_secret_access_key:
|
||||
file: ./secrets/s3_admin_secret_access_key
|
||||
s3_identities:
|
||||
file: ./secrets/s3_identities.json
|
||||
|
||||
Reference in New Issue
Block a user