diff --git a/.env.example b/.env.example index 85589ca..729d892 100644 --- a/.env.example +++ b/.env.example @@ -25,6 +25,7 @@ MAX_UPLOAD_BYTES=10485760 MAX_IMAGE_PIXELS=40000000 BROKER_URL_FILE=/run/secrets/broker_url +BROKER_PASSWORD_FILE=/run/secrets/broker_password WORKER_CONCURRENCY=2 JOB_MAX_ATTEMPTS=5 JOB_TIMEOUT_SECONDS=60 diff --git a/compose.yaml b/compose.yaml index 1c52a32..2671fe0 100644 --- a/compose.yaml +++ b/compose.yaml @@ -81,6 +81,35 @@ services: memory: 128M restart: unless-stopped + rabbitmq: + image: rabbitmq:4.2.9-alpine + hostname: rabbitmq + environment: + RABBITMQ_DEFAULT_USER: messenger + BROKER_PASSWORD_FILE: ${BROKER_PASSWORD_FILE:-/run/secrets/broker_password} + entrypoint: ["/bin/sh", "-ec"] + command: + - | + RABBITMQ_DEFAULT_PASS="$$(cat "$$BROKER_PASSWORD_FILE")" + export RABBITMQ_DEFAULT_PASS + exec docker-entrypoint.sh rabbitmq-server + secrets: + - broker_password + volumes: + - rabbitmq:/var/lib/rabbitmq + healthcheck: + test: ["CMD", "rabbitmq-diagnostics", "-q", "check_running"] + interval: 10s + timeout: 5s + retries: 10 + start_period: 30s + deploy: + resources: + limits: + cpus: "0.5" + memory: 512M + restart: unless-stopped + s3-config-init: build: context: . @@ -181,6 +210,10 @@ secrets: file: ./secrets/database_url.txt cache_url: file: ./secrets/cache_url.txt + broker_password: + file: ./secrets/broker_password.txt + broker_url: + file: ./secrets/broker_url.txt s3_access_key_id: file: ./secrets/s3_access_key_id.txt s3_secret_access_key: @@ -194,3 +227,4 @@ volumes: pgdata: seaweedfs: s3config: + rabbitmq: