From 68f198d0fbdfdc5633621fab81e6ba3efe47a438 Mon Sep 17 00:00:00 2001 From: vasyukova Date: Thu, 22 Oct 2026 17:01:17 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81:=20=D0=B8=D1=81=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D0=B0=20compose.yaml:=20=D1=83?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=BB=D0=B0=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4?= =?UTF-8?q?=D0=B0=D1=87=D1=83=20=D0=BE=D0=B1=D1=89=D0=B5=D0=B3=D0=BE=20.en?= =?UTF-8?q?v=20=D0=B2=20api/migrate/s3=5Fcleanup,=20=D0=B0=D0=B4=D0=BC?= =?UTF-8?q?=D0=B8=D0=BD=D1=81=D0=BA=D0=B8=D0=B5=20=D0=BA=D1=80=D0=B5=D0=B4?= =?UTF-8?q?=D1=8B=20MinIO=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D1=82?= =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D1=83=20minio=20=D0=B8=20mini?= =?UTF-8?q?o-init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compose.yaml | 55 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/compose.yaml b/compose.yaml index 41785155..6e0aa685 100644 --- a/compose.yaml +++ b/compose.yaml @@ -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