Обновила compose.yaml и Dockerfile
This commit is contained in:
+8
-5
@@ -8,8 +8,9 @@ RUN pip install --no-cache-dir --prefix=/install -r requirements.txt
|
||||
# --- runtime stage ---
|
||||
FROM python:3.12-slim
|
||||
|
||||
# Непривилегированный пользователь
|
||||
RUN useradd --create-home --shell /bin/bash appuser
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends curl && \
|
||||
rm -rf /var/lib/apt/lists/* && \
|
||||
useradd --create-home --shell /bin/bash appuser
|
||||
|
||||
WORKDIR /app
|
||||
COPY --from=builder /install /usr/local
|
||||
@@ -24,8 +25,10 @@ ENV PYTHONUNBUFFERED=1 \
|
||||
USER appuser
|
||||
EXPOSE 8080
|
||||
|
||||
HEALTHCHECK --interval=10s --timeout=3s --start-period=5s --retries=3 \
|
||||
CMD python -c "import urllib.request; urllib.request.urlopen('http://127.0.0.1:8080/health/live').read()"
|
||||
HEALTHCHECK --interval=10s --timeout=3s --start-period=15s --retries=3 \
|
||||
CMD python -c "import ssl,urllib.request; ctx=ssl.create_default_context(cafile='/certs/ca.crt'); urllib.request.urlopen('https://127.0.0.1:8080/health/live', context=ctx).read()"
|
||||
|
||||
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
|
||||
CMD ["python", "-m", "uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8080", "--app-dir", "src"]
|
||||
# lab7: API слушает TLS с обязательным клиентским сертификатом (LB->API mTLS).
|
||||
# ssl_cert_reqs=2 = CERT_REQUIRED.
|
||||
CMD ["sh", "-c", "python -m uvicorn app.main:app --host 0.0.0.0 --port 8080 --app-dir src --ssl-ca-certs /certs/ca.crt --ssl-certfile /certs/api-server.crt --ssl-keyfile /certs/api-server.key --ssl-cert-reqs 2"]
|
||||
+351
-26
@@ -1,4 +1,4 @@
|
||||
x-lab-number: 6
|
||||
x-lab-number: 7
|
||||
x-required-roles:
|
||||
- api
|
||||
- postgres
|
||||
@@ -9,17 +9,274 @@ x-required-roles:
|
||||
- otel_collector
|
||||
- telemetry_storage
|
||||
- grafana
|
||||
- openbao
|
||||
|
||||
services:
|
||||
# ---------- PKI (one-shot) ----------
|
||||
security_init:
|
||||
image: alpine:3.20
|
||||
container_name: mtuci-security-init
|
||||
user: "0:0"
|
||||
volumes:
|
||||
- ./certs:/certs
|
||||
- ./secrets:/secrets
|
||||
environment:
|
||||
CA_SUBJECT: ${CA_SUBJECT:-/CN=MTUCI-Lab7-CA}
|
||||
SERVER_CN: ${SERVER_CN:-localhost}
|
||||
entrypoint: ["/bin/sh", "-c"]
|
||||
command:
|
||||
- |
|
||||
set -eu
|
||||
apk add --no-cache openssl >/dev/null 2>&1 || true
|
||||
mkdir -p /certs /secrets
|
||||
# --- CA ---
|
||||
if [ ! -f /certs/ca.crt ]; then
|
||||
openssl genrsa -out /certs/ca.key 4096
|
||||
openssl req -x509 -new -nodes -key /certs/ca.key -sha256 -days 3650 \
|
||||
-subj "$${CA_SUBJECT}" -out /certs/ca.crt
|
||||
fi
|
||||
# --- LB external server cert ---
|
||||
if [ ! -f /certs/server.crt ]; then
|
||||
openssl genrsa -out /certs/server.key 2048
|
||||
cat > /certs/server.ext <<EOF
|
||||
subjectAltName=DNS:$${SERVER_CN},DNS:localhost,IP:127.0.0.1
|
||||
extendedKeyUsage=serverAuth
|
||||
EOF
|
||||
openssl req -new -key /certs/server.key -subj "/CN=$${SERVER_CN}" -out /certs/server.csr
|
||||
openssl x509 -req -in /certs/server.csr -CA /certs/ca.crt -CAkey /certs/ca.key \
|
||||
-CAcreateserial -out /certs/server.crt -days 825 -sha256 -extfile /certs/server.ext
|
||||
fi
|
||||
# --- API server cert ---
|
||||
if [ ! -f /certs/api-server.crt ]; then
|
||||
openssl genrsa -out /certs/api-server.key 2048
|
||||
cat > /certs/api-server.ext <<EOF
|
||||
subjectAltName=DNS:api,DNS:localhost,IP:127.0.0.1
|
||||
extendedKeyUsage=serverAuth
|
||||
EOF
|
||||
openssl req -new -key /certs/api-server.key -subj "/CN=api" -out /certs/api-server.csr
|
||||
openssl x509 -req -in /certs/api-server.csr -CA /certs/ca.crt -CAkey /certs/ca.key \
|
||||
-CAcreateserial -out /certs/api-server.crt -days 825 -sha256 -extfile /certs/api-server.ext
|
||||
fi
|
||||
# --- LB client cert ---
|
||||
if [ ! -f /certs/lb-client.crt ]; then
|
||||
openssl genrsa -out /certs/lb-client.key 2048
|
||||
cat > /certs/lb-client.ext <<EOF
|
||||
extendedKeyUsage=clientAuth
|
||||
subjectAltName=DNS:lb-client
|
||||
EOF
|
||||
openssl req -new -key /certs/lb-client.key -subj "/CN=lb-client" -out /certs/lb-client.csr
|
||||
openssl x509 -req -in /certs/lb-client.csr -CA /certs/ca.crt -CAkey /certs/ca.key \
|
||||
-CAcreateserial -out /certs/lb-client.crt -days 825 -sha256 -extfile /certs/lb-client.ext
|
||||
fi
|
||||
# --- Client certs: API/worker/outbox -> Collector ---
|
||||
for id in api worker outbox; do
|
||||
if [ ! -f /certs/$${id}-client.crt ]; then
|
||||
openssl genrsa -out /certs/$${id}-client.key 2048
|
||||
cat > /certs/$${id}-client.ext <<EOF
|
||||
extendedKeyUsage=clientAuth
|
||||
subjectAltName=DNS:$${id}
|
||||
EOF
|
||||
openssl req -new -key /certs/$${id}-client.key -subj "/CN=$${id}" -out /certs/$${id}-client.csr
|
||||
openssl x509 -req -in /certs/$${id}-client.csr -CA /certs/ca.crt -CAkey /certs/ca.key \
|
||||
-CAcreateserial -out /certs/$${id}-client.crt -days 825 -sha256 -extfile /certs/$${id}-client.ext
|
||||
fi
|
||||
done
|
||||
# --- OpenBao server cert ---
|
||||
if [ ! -f /certs/bao-server.crt ]; then
|
||||
openssl genrsa -out /certs/bao-server.key 2048
|
||||
cat > /certs/bao-server.ext <<EOF
|
||||
subjectAltName=DNS:openbao,DNS:localhost,IP:127.0.0.1
|
||||
extendedKeyUsage=serverAuth
|
||||
EOF
|
||||
openssl req -new -key /certs/bao-server.key -subj "/CN=openbao" -out /certs/bao-server.csr
|
||||
openssl x509 -req -in /certs/bao-server.csr -CA /certs/ca.crt -CAkey /certs/ca.key \
|
||||
-CAcreateserial -out /certs/bao-server.crt -days 825 -sha256 -extfile /certs/bao-server.ext
|
||||
fi
|
||||
# --- Collector server cert ---
|
||||
if [ ! -f /certs/collector-server.crt ]; then
|
||||
openssl genrsa -out /certs/collector-server.key 2048
|
||||
cat > /certs/collector-server.ext <<EOF
|
||||
subjectAltName=DNS:otel-collector,DNS:localhost,IP:127.0.0.1
|
||||
extendedKeyUsage=serverAuth
|
||||
EOF
|
||||
openssl req -new -key /certs/collector-server.key -subj "/CN=otel-collector" -out /certs/collector-server.csr
|
||||
openssl x509 -req -in /certs/collector-server.csr -CA /certs/ca.crt -CAkey /certs/ca.key \
|
||||
-CAcreateserial -out /certs/collector-server.crt -days 825 -sha256 -extfile /certs/collector-server.ext
|
||||
fi
|
||||
# --- PostgreSQL server cert ---
|
||||
if [ ! -f /certs/postgres-server.crt ]; then
|
||||
openssl genrsa -out /certs/postgres-server.key 2048
|
||||
cat > /certs/postgres-server.ext <<EOF
|
||||
subjectAltName=DNS:postgres,DNS:localhost,IP:127.0.0.1
|
||||
extendedKeyUsage=serverAuth
|
||||
EOF
|
||||
openssl req -new -key /certs/postgres-server.key -subj "/CN=postgres" -out /certs/postgres-server.csr
|
||||
openssl x509 -req -in /certs/postgres-server.csr -CA /certs/ca.crt -CAkey /certs/ca.key \
|
||||
-CAcreateserial -out /certs/postgres-server.crt -days 825 -sha256 -extfile /certs/postgres-server.ext
|
||||
fi
|
||||
# Права: сервисы в контейнерах работают от разных UID (postgres, openbao и т.п.),
|
||||
# поэтому cert/key должны быть читаемы как обычные файлы. Учебный стенд → 644.
|
||||
# ИСКЛЮЧЕНИЕ: PostgreSQL требует 0600 И владельца postgres. chown ниже работает,
|
||||
# но bind-mount из Windows (NTFS) может терять UID — поэтому postgres
|
||||
# использует entrypoint-wrapper, который копирует ключ в свой container fs.
|
||||
chmod 644 /certs/*.crt 2>/dev/null || true
|
||||
chmod 644 /certs/*.key 2>/dev/null || true
|
||||
chmod 600 /certs/ca.key 2>/dev/null || true
|
||||
chown 999:999 /certs/postgres-server.key 2>/dev/null || true
|
||||
chmod 600 /certs/postgres-server.key 2>/dev/null || true
|
||||
echo "event=pki_ready"
|
||||
|
||||
# ---------- OpenBao (non-dev, file storage, TLS) ----------
|
||||
openbao:
|
||||
image: openbao/openbao:2.0.2
|
||||
container_name: mtuci-openbao
|
||||
# lab7 fix: НЕ используем init: true — tini как PID 1 не освобождает
|
||||
# порт при рестартах, старый bao остаётся жив и получается
|
||||
# "bind: address already in use". Без tini bao - PID 1 и корректно
|
||||
# завершается по SIGTERM.
|
||||
#
|
||||
# lab7 fix: явный entrypoint — образ openbao/openbao:2.0.2 уже имеет
|
||||
# ENTRYPOINT ["bao"], но при command: ["server", "-config=..."] в
|
||||
# некоторых версиях Docker Desktop получалось дублирование команды
|
||||
# (`bao server bao server ...`), и второй bao падал с
|
||||
# "address already in use". Явный entrypoint исключает это.
|
||||
entrypoint: ["bao"]
|
||||
depends_on:
|
||||
security_init:
|
||||
condition: service_completed_successfully
|
||||
environment:
|
||||
SKIP_SETCAP: "1"
|
||||
volumes:
|
||||
- ./infra/openbao/bao.hcl:/openbao/config/bao.hcl:ro
|
||||
- ./certs:/certs:ro
|
||||
- openbao-data:/openbao/data
|
||||
command: ["server", "-config=/openbao/config/bao.hcl"]
|
||||
# lab7: порт 8200 НЕ публикуем наружу — сервис доступен только по
|
||||
# внутреннему DNS-имени openbao в compose-сети.
|
||||
#
|
||||
# lab7 fix: healthcheck через TCP-проверку listener'а. `bao status`
|
||||
# при sealed возвращает exit 2 → deadlock: openbao-init ждёт healthy,
|
||||
# а healthy требует unsealed. `nc -z` проверяет только "порт открыт".
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "nc -z 127.0.0.1 8200"]
|
||||
interval: 5s
|
||||
timeout: 3s
|
||||
retries: 20
|
||||
start_period: 15s
|
||||
restart: on-failure:3
|
||||
stop_grace_period: 15s
|
||||
stop_signal: SIGTERM
|
||||
deploy:
|
||||
resources:
|
||||
limits:
|
||||
cpus: "0.5"
|
||||
memory: 256M
|
||||
reservations:
|
||||
cpus: "0.1"
|
||||
memory: 64M
|
||||
|
||||
openbao-init:
|
||||
image: openbao/openbao:2.0.2
|
||||
container_name: mtuci-openbao-init
|
||||
# lab7 fix: jq нужен для разбора /secrets/bao-init.json, но в образе
|
||||
# openbao/openbao:2.0.2 его нет. Ставим через apk — для этого нужен
|
||||
# root. Контейнер одноразовый bootstrap, root здесь уместен.
|
||||
user: "0:0"
|
||||
depends_on:
|
||||
openbao:
|
||||
condition: service_healthy
|
||||
security_init:
|
||||
condition: service_completed_successfully
|
||||
volumes:
|
||||
- ./certs:/certs:ro
|
||||
- ./secrets:/secrets
|
||||
- ./infra/openbao:/openbao-config:ro
|
||||
environment:
|
||||
BAO_ADDR: ${BAO_ADDR:-https://openbao:8200}
|
||||
BAO_CACERT: /certs/ca.crt
|
||||
entrypoint: ["/bin/sh", "-c"]
|
||||
command:
|
||||
- |
|
||||
set -eu
|
||||
apk add --no-cache jq >/dev/null 2>&1 || true
|
||||
# lab7 fix: BAO_CACERT экспортируется ДО bao status/init/unseal.
|
||||
export BAO_CACERT=/certs/ca.crt
|
||||
|
||||
# lab7 fix: единственный надёжный признак «уже инициализирован» —
|
||||
# наличие /secrets/bao-init.json. `bao status` НЕ подходит:
|
||||
# после рестарта openbao sealed, и `bao status` возвращает exit 2
|
||||
# (это нормальное поведение sealed-хранилища, а не «не
|
||||
# инициализирован»). Из-за этого скрипт повторно звал
|
||||
# `bao operator init` → 400 already initialized → exit 2.
|
||||
if [ -f /secrets/bao-init.json ]; then
|
||||
echo "event=bao_already_initialized"
|
||||
else
|
||||
bao operator init -key-shares=1 -key-threshold=1 \
|
||||
-format=json > /secrets/bao-init.json
|
||||
chmod 600 /secrets/bao-init.json
|
||||
echo "event=bao_initialized"
|
||||
fi
|
||||
|
||||
UNSEAL=$$(jq -r '.unseal_keys_b64[0]' /secrets/bao-init.json)
|
||||
ROOT=$$(jq -r '.root_token' /secrets/bao-init.json)
|
||||
# unseal идемпотентен: на уже распечатанном хранилище вернёт
|
||||
# «Vault is already unsealed», это ок (|| true).
|
||||
bao operator unseal "$$UNSEAL" >/dev/null 2>&1 || true
|
||||
export BAO_TOKEN="$$ROOT"
|
||||
|
||||
# Всё ниже идемпотентно: `2>/dev/null || true` — повторный
|
||||
# запуск не падает, если путь/политика/AppRole уже созданы.
|
||||
bao secrets enable -path=secret kv-v2 2>/dev/null || true
|
||||
bao policy write api-policy /openbao-config/api-policy.hcl
|
||||
bao policy write worker-policy /openbao-config/worker-policy.hcl
|
||||
bao auth enable approle 2>/dev/null || true
|
||||
bao write auth/approle/role/api token_policies=api-policy \
|
||||
token_ttl=15m token_max_ttl=1h secret_id_ttl=15m secret_id_num_uses=10 2>/dev/null || true
|
||||
bao write auth/approle/role/worker token_policies=worker-policy \
|
||||
token_ttl=15m token_max_ttl=1h secret_id_ttl=15m secret_id_num_uses=10 2>/dev/null || true
|
||||
|
||||
API_ROLE_ID=$$(bao read -field=role_id auth/approle/role/api/role-id)
|
||||
API_SECRET_ID=$$(bao write -f -field=secret_id auth/approle/role/api/secret-id)
|
||||
WORKER_ROLE_ID=$$(bao read -field=role_id auth/approle/role/worker/role-id)
|
||||
WORKER_SECRET_ID=$$(bao write -f -field=secret_id auth/approle/role/worker/secret-id)
|
||||
printf "API_ROLE_ID=$$API_ROLE_ID\nAPI_SECRET_ID=$$API_SECRET_ID\n" > /secrets/api-approle.env
|
||||
printf "WORKER_ROLE_ID=$$WORKER_ROLE_ID\nWORKER_SECRET_ID=$$WORKER_SECRET_ID\n" > /secrets/worker-approle.env
|
||||
chmod 600 /secrets/api-approle.env /secrets/worker-approle.env
|
||||
echo "event=openbao_bootstrap_done"
|
||||
restart: "no"
|
||||
|
||||
# ---------- Хранилища ----------
|
||||
postgres:
|
||||
image: postgres:18.6-alpine
|
||||
container_name: mtuci-postgres
|
||||
depends_on:
|
||||
security_init:
|
||||
condition: service_completed_successfully
|
||||
environment:
|
||||
POSTGRES_USER: ${POSTGRES_USER:-messenger}
|
||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-messenger}
|
||||
POSTGRES_DB: ${POSTGRES_DB:-high_load_messenger}
|
||||
# lab7: bind-mount из Windows (NTFS/WSL2) не сохраняет UID владельца,
|
||||
# поэтому postmaster видит postgres-server.key как "чужой". Решение:
|
||||
# entrypoint копирует certs из read-only bind в /var/lib/postgresql/certs
|
||||
# (обычная container-fs) и выставляет 0600/0644 + chown postgres:postgres.
|
||||
entrypoint: ["/bin/sh", "-c"]
|
||||
command:
|
||||
- |
|
||||
set -eu
|
||||
mkdir -p /var/lib/postgresql/certs
|
||||
cp /etc/postgres-certs-src/*.crt /etc/postgres-certs-src/*.key /var/lib/postgresql/certs/
|
||||
chown -R postgres:postgres /var/lib/postgresql/certs
|
||||
chmod 644 /var/lib/postgresql/certs/*.crt
|
||||
chmod 600 /var/lib/postgresql/certs/*.key
|
||||
exec docker-entrypoint.sh postgres \
|
||||
-c ssl=on \
|
||||
-c ssl_cert_file=/var/lib/postgresql/certs/postgres-server.crt \
|
||||
-c ssl_key_file=/var/lib/postgresql/certs/postgres-server.key \
|
||||
-c ssl_ca_file=/var/lib/postgresql/certs/ca.crt
|
||||
volumes:
|
||||
- postgres-data:/var/lib/postgresql
|
||||
- ./certs:/etc/postgres-certs-src:ro
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-messenger} -d ${POSTGRES_DB:-high_load_messenger}"]
|
||||
interval: 5s
|
||||
@@ -128,7 +385,7 @@ services:
|
||||
|
||||
migrate:
|
||||
build: .
|
||||
image: mtuci-messenger:lab6
|
||||
image: mtuci-messenger:lab7
|
||||
command: ["python", "-m", "app.storage.db"]
|
||||
environment:
|
||||
APP_ENV: ${APP_ENV:-lab}
|
||||
@@ -176,7 +433,7 @@ services:
|
||||
|
||||
worker:
|
||||
build: .
|
||||
image: mtuci-messenger:lab6
|
||||
image: mtuci-messenger:lab7
|
||||
command: ["python", "-m", "app.worker"]
|
||||
environment:
|
||||
APP_ENV: ${APP_ENV:-lab}
|
||||
@@ -188,9 +445,17 @@ services:
|
||||
S3_APP_SECRET_KEY: ${S3_APP_SECRET_KEY}
|
||||
RABBITMQ_URL: ${RABBITMQ_URL:-amqp://messenger:messenger-rabbit-change-me@rabbitmq:5672/%2F}
|
||||
OTEL_SERVICE_NAME: messenger-worker
|
||||
OTEL_EXPORTER_OTLP_ENDPOINT: ${OTEL_EXPORTER_OTLP_ENDPOINT:-http://otel-collector:4318}
|
||||
OTEL_EXPORTER_OTLP_ENDPOINT: https://otel-collector:4318
|
||||
OTEL_EXPORTER_OTLP_PROTOCOL: ${OTEL_EXPORTER_OTLP_PROTOCOL:-http/protobuf}
|
||||
OTEL_RESOURCE_ATTRIBUTES: ${OTEL_RESOURCE_ATTRIBUTES:-deployment.environment.name=lab}
|
||||
OTEL_EXPORTER_OTLP_CERTIFICATE: /certs/ca.crt
|
||||
OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE: /certs/worker-client.crt
|
||||
OTEL_EXPORTER_OTLP_CLIENT_KEY: /certs/worker-client.key
|
||||
BAO_ADDR: ${BAO_ADDR:-https://openbao:8200}
|
||||
BAO_CACERT: ${BAO_CACERT:-/certs/ca.crt}
|
||||
volumes:
|
||||
- ./certs:/certs:ro
|
||||
- ./secrets:/secrets:ro
|
||||
depends_on:
|
||||
migrate:
|
||||
condition: service_completed_successfully
|
||||
@@ -198,8 +463,17 @@ services:
|
||||
condition: service_completed_successfully
|
||||
rabbitmq:
|
||||
condition: service_healthy
|
||||
openbao-init:
|
||||
condition: service_completed_successfully
|
||||
otel-collector:
|
||||
condition: service_started
|
||||
read_only: true
|
||||
tmpfs:
|
||||
- /tmp
|
||||
security_opt:
|
||||
- no-new-privileges:true
|
||||
cap_drop:
|
||||
- ALL
|
||||
restart: unless-stopped
|
||||
deploy:
|
||||
resources:
|
||||
@@ -212,16 +486,21 @@ services:
|
||||
|
||||
outbox:
|
||||
build: .
|
||||
image: mtuci-messenger:lab6
|
||||
image: mtuci-messenger:lab7
|
||||
command: ["python", "-m", "app.outbox_worker"]
|
||||
environment:
|
||||
APP_ENV: ${APP_ENV:-lab}
|
||||
DATABASE_URL: ${DATABASE_URL}
|
||||
RABBITMQ_URL: ${RABBITMQ_URL:-amqp://messenger:messenger-rabbit-change-me@rabbitmq:5672/%2F}
|
||||
OTEL_SERVICE_NAME: messenger-outbox
|
||||
OTEL_EXPORTER_OTLP_ENDPOINT: ${OTEL_EXPORTER_OTLP_ENDPOINT:-http://otel-collector:4318}
|
||||
OTEL_EXPORTER_OTLP_ENDPOINT: https://otel-collector:4318
|
||||
OTEL_EXPORTER_OTLP_PROTOCOL: ${OTEL_EXPORTER_OTLP_PROTOCOL:-http/protobuf}
|
||||
OTEL_RESOURCE_ATTRIBUTES: ${OTEL_RESOURCE_ATTRIBUTES:-deployment.environment.name=lab}
|
||||
OTEL_EXPORTER_OTLP_CERTIFICATE: /certs/ca.crt
|
||||
OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE: /certs/outbox-client.crt
|
||||
OTEL_EXPORTER_OTLP_CLIENT_KEY: /certs/outbox-client.key
|
||||
volumes:
|
||||
- ./certs:/certs:ro
|
||||
depends_on:
|
||||
migrate:
|
||||
condition: service_completed_successfully
|
||||
@@ -229,6 +508,13 @@ services:
|
||||
condition: service_healthy
|
||||
otel-collector:
|
||||
condition: service_started
|
||||
read_only: true
|
||||
tmpfs:
|
||||
- /tmp
|
||||
security_opt:
|
||||
- no-new-privileges:true
|
||||
cap_drop:
|
||||
- ALL
|
||||
restart: unless-stopped
|
||||
deploy:
|
||||
resources:
|
||||
@@ -238,7 +524,7 @@ services:
|
||||
|
||||
api:
|
||||
build: .
|
||||
image: mtuci-messenger:lab6
|
||||
image: mtuci-messenger:lab7
|
||||
environment:
|
||||
APP_HOST: ${APP_HOST:-0.0.0.0}
|
||||
APP_PORT: ${APP_PORT:-8080}
|
||||
@@ -255,12 +541,26 @@ services:
|
||||
S3_APP_SECRET_KEY: ${S3_APP_SECRET_KEY}
|
||||
MAX_UPLOAD_BYTES: ${MAX_UPLOAD_BYTES:-10485760}
|
||||
MAX_IMAGE_PIXELS: ${MAX_IMAGE_PIXELS:-40000000}
|
||||
MAX_REQUEST_BODY_BYTES: ${MAX_REQUEST_BODY_BYTES:-10485760}
|
||||
CLEANUP_INTERVAL_SECONDS: ${CLEANUP_INTERVAL_SECONDS:-300}
|
||||
ORPHAN_GRACE_SECONDS: ${ORPHAN_GRACE_SECONDS:-3600}
|
||||
OTEL_SERVICE_NAME: messenger-api
|
||||
OTEL_EXPORTER_OTLP_ENDPOINT: ${OTEL_EXPORTER_OTLP_ENDPOINT:-http://otel-collector:4318}
|
||||
OTEL_EXPORTER_OTLP_ENDPOINT: https://otel-collector:4318
|
||||
OTEL_EXPORTER_OTLP_PROTOCOL: ${OTEL_EXPORTER_OTLP_PROTOCOL:-http/protobuf}
|
||||
OTEL_RESOURCE_ATTRIBUTES: ${OTEL_RESOURCE_ATTRIBUTES:-deployment.environment.name=lab}
|
||||
OTEL_EXPORTER_OTLP_CERTIFICATE: /certs/ca.crt
|
||||
OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE: /certs/api-client.crt
|
||||
OTEL_EXPORTER_OTLP_CLIENT_KEY: /certs/api-client.key
|
||||
ARGON2_MEMORY_KIB: ${ARGON2_MEMORY_KIB:-19456}
|
||||
ARGON2_ITERATIONS: ${ARGON2_ITERATIONS:-2}
|
||||
ARGON2_PARALLELISM: ${ARGON2_PARALLELISM:-1}
|
||||
LOGIN_WINDOW_SECONDS: ${LOGIN_WINDOW_SECONDS:-60}
|
||||
LOGIN_MAX_ATTEMPTS: ${LOGIN_MAX_ATTEMPTS:-10}
|
||||
BAO_ADDR: ${BAO_ADDR:-https://openbao:8200}
|
||||
BAO_CACERT: ${BAO_CACERT:-/certs/ca.crt}
|
||||
volumes:
|
||||
- ./certs:/certs:ro
|
||||
- ./secrets:/secrets:ro
|
||||
depends_on:
|
||||
migrate:
|
||||
condition: service_completed_successfully
|
||||
@@ -270,14 +570,27 @@ services:
|
||||
condition: service_healthy
|
||||
minio-init:
|
||||
condition: service_completed_successfully
|
||||
openbao-init:
|
||||
condition: service_completed_successfully
|
||||
otel-collector:
|
||||
condition: service_started
|
||||
healthcheck:
|
||||
test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://127.0.0.1:8080/health/ready').read()"]
|
||||
# lab7 fix: uvicorn запущен с --ssl-cert-reqs 2 (CERT_REQUIRED, mTLS).
|
||||
# Без клиентского сертификата сервер рвёт соединение до ответа
|
||||
# (RemoteDisconnected). Используем ровно ту identity, которой
|
||||
# ходит LB: /certs/lb-client.crt + lb-client.key, CA=/certs/ca.crt.
|
||||
test: ["CMD", "python", "-c", "import ssl,urllib.request; ctx=ssl.create_default_context(cafile='/certs/ca.crt'); ctx.load_cert_chain(certfile='/certs/lb-client.crt', keyfile='/certs/lb-client.key'); urllib.request.urlopen('https://127.0.0.1:8080/health/ready', context=ctx, timeout=3).read()"]
|
||||
interval: 5s
|
||||
timeout: 3s
|
||||
retries: 5
|
||||
start_period: 10s
|
||||
timeout: 5s
|
||||
retries: 10
|
||||
start_period: 30s
|
||||
read_only: true
|
||||
tmpfs:
|
||||
- /tmp
|
||||
security_opt:
|
||||
- no-new-privileges:true
|
||||
cap_drop:
|
||||
- ALL
|
||||
restart: unless-stopped
|
||||
deploy:
|
||||
replicas: 2
|
||||
@@ -291,7 +604,7 @@ services:
|
||||
|
||||
s3_cleanup:
|
||||
build: .
|
||||
image: mtuci-messenger:lab6
|
||||
image: mtuci-messenger:lab7
|
||||
command: ["python", "-m", "app.storage.s3_cleanup"]
|
||||
environment:
|
||||
APP_ENV: ${APP_ENV:-lab}
|
||||
@@ -322,12 +635,24 @@ services:
|
||||
image: nginx:1.27.3-alpine
|
||||
container_name: mtuci-lb
|
||||
ports:
|
||||
- "127.0.0.1:8080:80"
|
||||
- "127.0.0.1:8443:8443"
|
||||
volumes:
|
||||
- ./infra/nginx.conf:/etc/nginx/conf.d/default.conf:ro
|
||||
- ./certs:/etc/nginx/certs:ro
|
||||
depends_on:
|
||||
api:
|
||||
condition: service_healthy
|
||||
read_only: true
|
||||
tmpfs:
|
||||
- /var/cache/nginx
|
||||
- /var/run
|
||||
security_opt:
|
||||
- no-new-privileges:true
|
||||
cap_drop:
|
||||
- ALL
|
||||
cap_add:
|
||||
- NET_BIND_SERVICE
|
||||
- CHOWN
|
||||
restart: unless-stopped
|
||||
deploy:
|
||||
resources:
|
||||
@@ -338,19 +663,17 @@ services:
|
||||
cpus: "0.1"
|
||||
memory: 32M
|
||||
|
||||
# ---------- Observability: lab6 ----------
|
||||
otel-collector:
|
||||
image: otel/opentelemetry-collector-contrib:0.108.0
|
||||
container_name: mtuci-otel-collector
|
||||
command: ["--config=/etc/otel/collector.yaml"]
|
||||
volumes:
|
||||
- ./infra/otel/collector.yaml:/etc/otel/collector.yaml:ro
|
||||
- ./certs:/certs:ro
|
||||
depends_on:
|
||||
- tempo
|
||||
- loki
|
||||
- prometheus
|
||||
# Порты OTLP наружу не публикуем: API/worker/outbox в той же сети.
|
||||
# health-порт тоже внутри compose-сети.
|
||||
healthcheck:
|
||||
test: ["CMD", "/otelcol-contrib", "--version"]
|
||||
interval: 10s
|
||||
@@ -454,22 +777,24 @@ services:
|
||||
|
||||
volumes:
|
||||
postgres-data:
|
||||
name: mtuci2026lab5_postgres-data
|
||||
name: mtuci2026lab7_postgres-data
|
||||
redis-data:
|
||||
name: mtuci2026lab5_redis-data
|
||||
name: mtuci2026lab7_redis-data
|
||||
minio-data:
|
||||
name: mtuci2026lab5_minio-data
|
||||
name: mtuci2026lab7_minio-data
|
||||
rabbitmq-data:
|
||||
name: mtuci2026lab5_rabbitmq-data
|
||||
name: mtuci2026lab7_rabbitmq-data
|
||||
prometheus-data:
|
||||
name: mtuci2026lab6_prometheus-data
|
||||
name: mtuci2026lab7_prometheus-data
|
||||
loki-data:
|
||||
name: mtuci2026lab6_loki-data
|
||||
name: mtuci2026lab7_loki-data
|
||||
tempo-data:
|
||||
name: mtuci2026lab6_tempo-data
|
||||
name: mtuci2026lab7_tempo-data
|
||||
grafana-data:
|
||||
name: mtuci2026lab6_grafana-data
|
||||
name: mtuci2026lab7_grafana-data
|
||||
openbao-data:
|
||||
name: mtuci2026lab7_openbao-data
|
||||
|
||||
networks:
|
||||
default:
|
||||
name: mtuci2026lab6_default
|
||||
name: mtuci2026lab7_default
|
||||
Reference in New Issue
Block a user