Compare commits

...

9 Commits

2 changed files with 37 additions and 14 deletions

View File

@ -71,4 +71,4 @@ LOGGING_LEVEL_LOGGERS_APP=INFO
# MIGRATIONS # MIGRATIONS
############################################################################## ##############################################################################
# Set to false to disable automatic migrations on backend startup # Set to false to disable automatic migrations on backend startup
AUTO_MIGRATIONS=true # AUTO_MIGRATIONS=true

View File

@ -49,10 +49,10 @@ x-common-env: &common-env
LOGOUT_REDIRECT_URL: LOGOUT_REDIRECT_URL:
OIDC_REDIRECT_ALLOWED_HOSTS: OIDC_REDIRECT_ALLOWED_HOSTS:
OIDC_AUTH_REQUEST_EXTRA_PARAMS: OIDC_AUTH_REQUEST_EXTRA_PARAMS:
# AI (Fixme: remove?) # AI
AI_FEATURE_ENABLED: "false" AI_FEATURE_ENABLED: "false"
AI_BASE_URL: https://openaiendpoint.com OPENAI_SDK_BASE_URL: https://openaiendpoint.com
AI_API_KEY: password OPENAI_SDK_API_KEY: password
AI_MODEL: llama AI_MODEL: llama
# Collaboration # Collaboration
COLLABORATION_API_URL: https://$DOMAIN/collaboration/api/ COLLABORATION_API_URL: https://$DOMAIN/collaboration/api/
@ -84,14 +84,14 @@ x-minio-env: &minio-env
services: services:
app: app:
image: lasuite/impress-frontend:v4.5.0 image: lasuite/impress-frontend:v5.1.0
networks: networks:
- backend - backend
deploy: deploy:
labels: labels:
- "traefik.enable=false" - "traefik.enable=false"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
- "coop-cloud.${STACK_NAME}.version=0.2.8+v4.5.0" - "coop-cloud.${STACK_NAME}.version=0.3.0+v5.1.0"
user: "${DOCKER_USER:-1000}" user: "${DOCKER_USER:-1000}"
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8080"] test: ["CMD", "curl", "-f", "http://localhost:8080"]
@ -101,7 +101,7 @@ services:
start_period: 10s start_period: 10s
backend: backend:
image: lasuite/impress-backend:v4.5.0 image: lasuite/impress-backend:v5.1.0
networks: networks:
- backend - backend
environment: environment:
@ -136,9 +136,15 @@ services:
- email_pass - email_pass
celery: celery:
image: lasuite/impress-backend:v4.5.0 image: lasuite/impress-backend:v5.1.0
networks: networks:
- backend - backend
healthcheck:
test: ["CMD", "celery", "-A", "impress.celery_app", "inspect", "ping", "--timeout", "5"]
interval: 30s
timeout: 10s
retries: 3
start_period: 30s
user: "${DOCKER_USER:-1000}" user: "${DOCKER_USER:-1000}"
command: ["celery", "-A", "impress.celery_app", "worker", "-l", "INFO"] command: ["celery", "-A", "impress.celery_app", "worker", "-l", "INFO"]
environment: environment:
@ -160,15 +166,21 @@ services:
y-provider: y-provider:
image: lasuite/impress-y-provider:v4.5.0 image: lasuite/impress-y-provider:v5.1.0
networks: networks:
- backend - backend
healthcheck:
# y-provider returns 403 on unauthenticated requests; wget exit 4 = network error (server down), anything else = server is responding
test: ["CMD-SHELL", "wget -qO /dev/null http://localhost:4444/ 2>/dev/null; test $$? -ne 4"]
interval: 15s
timeout: 5s
retries: 3
start_period: 10s
environment: *yprovider-env environment: *yprovider-env
user: "${DOCKER_USER:-1000}" user: "${DOCKER_USER:-1000}"
entrypoint: > entrypoint: >
sh -c "export Y_PROVIDER_API_KEY=\"$$(cat /run/secrets/y_api_key)\" && exec /usr/local/bin/entrypoint \"$$@\"" -- sh -c "export Y_PROVIDER_API_KEY=\"$$(cat /run/secrets/y_api_key)\" && exec /usr/local/bin/entrypoint \"$$@\"" --
command: ["yarn", "start"] command: ["yarn", "start"]
# NOTE: healthcheck - `wget` is available in the container, but `wget http://localhost:4444` gives a 403
secrets: secrets:
- y_api_key - y_api_key
@ -200,7 +212,12 @@ services:
- postgres_p - postgres_p
redis: redis:
image: redis:8 image: redis:8.2.6
healthcheck:
test: ["CMD", "redis-cli", "ping"]
interval: 15s
timeout: 5s
retries: 3
networks: networks:
- backend - backend
@ -235,7 +252,13 @@ services:
- minio_ru - minio_ru
web: web:
image: nginx:1.29 image: nginx:1.30.0
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8083"]
interval: 15s
timeout: 5s
retries: 3
start_period: 10s
configs: configs:
- source: nginx_conf - source: nginx_conf
target: /etc/nginx/conf.d/default.conf target: /etc/nginx/conf.d/default.conf