diff --git a/Dockerfile b/Dockerfile index 16229253..a9b29baf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,11 +13,18 @@ RUN CGO_ENABLED=0 GOOS=linux go build \ -o /out/server \ ./cmd/server +RUN CGO_ENABLED=0 GOOS=linux go build \ + -trimpath \ + -ldflags="-s -w" \ + -o /out/worker \ + ./cmd/worker + FROM alpine:3.20 RUN adduser -D -u 1000 app COPY --from=builder /out/server /server +COPY --from=builder /out/worker /worker EXPOSE 8080 diff --git a/compose.yaml b/compose.yaml index 511ea1d5..dea121f8 100644 --- a/compose.yaml +++ b/compose.yaml @@ -64,29 +64,27 @@ services: networks: - internal -rabbitmq: - image: rabbitmq:3.13-management-alpine - restart: unless-stopped - environment: - RABBITMQ_DEFAULT_USER: "messenger" - RABBITMQ_DEFAULT_PASS_FILE: /run/secrets/rabbitmq_password - secrets: - - rabbitmq_password - volumes: - - rabbitmq_data:/var/lib/rabbitmq - ports: - - "15672:15672" - healthcheck: - test: ["CMD", "rabbitmq-diagnostics", "-q", "ping"] - interval: 5s - timeout: 3s - retries: 10 - deploy: - resources: - limits: - memory: 256M - networks: - - internal + rabbitmq: + image: rabbitmq:3.13-management-alpine + restart: unless-stopped + environment: + RABBITMQ_DEFAULT_USER: "messenger" + RABBITMQ_DEFAULT_PASS: "${RABBITMQ_PASSWORD}" + volumes: + - rabbitmq_data:/var/lib/rabbitmq + ports: + - "15672:15672" + healthcheck: + test: ["CMD", "rabbitmq-diagnostics", "-q", "ping"] + interval: 5s + timeout: 3s + retries: 10 + deploy: + resources: + limits: + memory: 256M + networks: + - internal minio: image: pgsty/silo:RELEASE.2026-09-16T00-00-00Z @@ -190,6 +188,8 @@ rabbitmq: RECONCILER_ENABLED: "${RECONCILER_ENABLED:-true}" RECONCILER_INTERVAL_SECONDS: "${RECONCILER_INTERVAL_SECONDS:-300}" RECONCILER_GRACE_SECONDS: "${RECONCILER_GRACE_SECONDS:-3600}" + RABBITMQ_URL: "amqp://messenger:${RABBITMQ_PASSWORD}@rabbitmq:5672/" + OUTBOX_INTERVAL_MS: "1000" secrets: - database_url - cache_url @@ -200,6 +200,8 @@ rabbitmq: condition: service_healthy redis: condition: service_healthy + rabbitmq: + condition: service_healthy migrate: condition: service_completed_successfully minio: @@ -221,6 +223,43 @@ rabbitmq: networks: - internal + worker: + build: + context: . + dockerfile: Dockerfile + image: mtusi-messenger-api:lab3 + command: ["/worker"] + restart: unless-stopped + environment: + DATABASE_URL_FILE: /run/secrets/database_url + S3_ENDPOINT: "http://minio:9000" + S3_BUCKET: "${S3_BUCKET:-messenger-attachments}" + S3_REGION: "${S3_REGION:-us-east-1}" + S3_USE_SSL: "false" + S3_ACCESS_KEY_ID_FILE: /run/secrets/s3_access_key_id + S3_SECRET_ACCESS_KEY_FILE: /run/secrets/s3_secret_access_key + RABBITMQ_URL: "amqp://messenger:${RABBITMQ_PASSWORD}@rabbitmq:5672/" + secrets: + - database_url + - s3_access_key_id + - s3_secret_access_key + depends_on: + postgres: + condition: service_healthy + migrate: + condition: service_completed_successfully + minio: + condition: service_healthy + rabbitmq: + condition: service_healthy + deploy: + replicas: 1 + resources: + limits: + memory: 256M + networks: + - internal + lb: image: nginx:1.27.4-alpine restart: unless-stopped @@ -254,8 +293,7 @@ secrets: file: ./secrets/s3_access_key_id s3_secret_access_key: file: ./secrets/s3_secret_access_key - rabbitmq_password: - file: ./secrets/rabbitmq_password + volumes: postgres_data: redis_data: