Фикс: исправила compose.yaml: убрала передачу общего .env в api/migrate/s3_cleanup, админские креды MinIO теперь только у minio и minio-init

This commit is contained in:
vasyukova
2026-10-22 17:01:17 +03:00
parent 172fc1c5ed
commit 68f198d0fb
+47 -8
View File
@@ -126,8 +126,13 @@ services:
mc admin policy create local messenger-app /tmp/app-policy.json 2>/dev/null || true
mc admin policy attach local messenger-app --user "$${S3_APP_KEY_ID}" || true
echo "minio-init done"
env_file:
- .env
# Административные credentials нужны только здесь и в minio.
environment:
MINIO_ROOT_USER: ${MINIO_ROOT_USER:-minioadmin}
MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD:-minioadmin}
S3_BUCKET: ${S3_BUCKET:-messenger-attachments}
S3_APP_KEY_ID: ${S3_APP_KEY_ID:-messenger-app}
S3_APP_SECRET_KEY: ${S3_APP_SECRET_KEY:-messenger-app-secret-change-me}
restart: "no"
deploy:
resources:
@@ -139,8 +144,14 @@ services:
build: .
image: mtuci-messenger:lab4
command: ["python", "-m", "app.storage.db"]
env_file:
- .env
# Явный whitelist переменных: без MINIO_ROOT_USER/PASSWORD.
environment:
APP_ENV: ${APP_ENV:-lab}
DATABASE_URL: ${DATABASE_URL}
SESSION_STORE: ${SESSION_STORE:-redis}
REDIS_URL: ${REDIS_URL:-redis://redis:6379/0}
SESSION_TTL_SECONDS: ${SESSION_TTL_SECONDS:-3600}
IDEMPOTENCY_TTL_SECONDS: ${IDEMPOTENCY_TTL_SECONDS:-86400}
depends_on:
postgres:
condition: service_healthy
@@ -157,8 +168,27 @@ services:
api:
build: .
image: mtuci-messenger:lab4
env_file:
- .env
# Явный whitelist переменных: приложение не получает административные
# credentials MinIO (MINIO_ROOT_USER/PASSWORD). Для S3 — только
# прикладные S3_APP_KEY_ID/S3_APP_SECRET_KEY с ограниченной политикой.
environment:
APP_HOST: ${APP_HOST:-0.0.0.0}
APP_PORT: ${APP_PORT:-8080}
APP_ENV: ${APP_ENV:-lab}
DATABASE_URL: ${DATABASE_URL}
SESSION_STORE: ${SESSION_STORE:-redis}
REDIS_URL: ${REDIS_URL:-redis://redis:6379/0}
SESSION_TTL_SECONDS: ${SESSION_TTL_SECONDS:-3600}
IDEMPOTENCY_TTL_SECONDS: ${IDEMPOTENCY_TTL_SECONDS:-86400}
S3_ENDPOINT: ${S3_ENDPOINT:-http://minio:9000}
S3_REGION: ${S3_REGION:-us-east-1}
S3_BUCKET: ${S3_BUCKET:-messenger-attachments}
S3_APP_KEY_ID: ${S3_APP_KEY_ID}
S3_APP_SECRET_KEY: ${S3_APP_SECRET_KEY}
MAX_UPLOAD_BYTES: ${MAX_UPLOAD_BYTES:-10485760}
MAX_IMAGE_PIXELS: ${MAX_IMAGE_PIXELS:-40000000}
CLEANUP_INTERVAL_SECONDS: ${CLEANUP_INTERVAL_SECONDS:-300}
ORPHAN_GRACE_SECONDS: ${ORPHAN_GRACE_SECONDS:-3600}
depends_on:
migrate:
condition: service_completed_successfully
@@ -191,8 +221,17 @@ services:
build: .
image: mtuci-messenger:lab4
command: ["python", "-m", "app.storage.s3_cleanup"]
env_file:
- .env
# Явный whitelist переменных: без административных кредов MinIO.
environment:
APP_ENV: ${APP_ENV:-lab}
DATABASE_URL: ${DATABASE_URL}
S3_ENDPOINT: ${S3_ENDPOINT:-http://minio:9000}
S3_REGION: ${S3_REGION:-us-east-1}
S3_BUCKET: ${S3_BUCKET:-messenger-attachments}
S3_APP_KEY_ID: ${S3_APP_KEY_ID}
S3_APP_SECRET_KEY: ${S3_APP_SECRET_KEY}
CLEANUP_INTERVAL_SECONDS: ${CLEANUP_INTERVAL_SECONDS:-300}
ORPHAN_GRACE_SECONDS: ${ORPHAN_GRACE_SECONDS:-3600}
depends_on:
migrate:
condition: service_completed_successfully