almost working with docker secrets

This commit is contained in:
2025-10-31 15:36:14 -04:00
parent 51c939dd2c
commit 184255b249
4 changed files with 69 additions and 37 deletions

View File

@ -73,6 +73,7 @@ x-yprovider-env: &yprovider-env
Y_PROVIDER_API_KEY: foobar
COLLABORATION_API_URL: http://y-provider:4444/api/
COLLABORATION_SERVER_ORIGIN: https://${DOMAIN}
# FIXME: Move to docker secret
COLLABORATION_SERVER_SECRET: my-secret
COLLABORATION_BACKEND_BASE_URL: https://${DOMAIN}
COLLABORATION_WS_URL: wss://${DOMAIN}/collaboration/ws/
@ -113,11 +114,20 @@ services:
timeout: 30s
retries: 20
start_period: 10s
command: ["gunicorn", "-c", "/usr/local/etc/gunicorn/impress.py", "impress.wsgi:application"]
entrypoint: /abra-lasuite-entrypoint.sh
configs:
- source: abra_lasuite_entrypoint
target: /abra-lasuite-entrypoint.sh
mode: 0555
secrets:
- django_secret_key
- oidc_rp_client_secret
- django_superuser_password
- collaboration_server_secret
- minio_root_password
- postgres_password
- db_password
celery:
image: lasuite/impress-backend:v3.4.2
@ -131,6 +141,15 @@ services:
- source: abra_lasuite_entrypoint
target: /abra-lasuite-entrypoint.sh
mode: 0555
secrets:
- django_secret_key
- oidc_rp_client_secret
- django_superuser_password
- collaboration_server_secret
- minio_root_password
- postgres_password
- db_password
y-provider:
image: lasuite/impress-y-provider:v3.4.2
@ -186,6 +205,8 @@ services:
replicas: 0
restart_policy:
condition: none
secrets:
- minio_root_password
minio:
image: minio/minio:RELEASE.2025-05-24T17-08-30Z
@ -195,7 +216,6 @@ services:
interval: 1s
timeout: 20s
retries: 300
entrypoint: ""
networks:
- backend
command: minio server /data
@ -204,6 +224,20 @@ services:
deploy:
labels:
backupbot.backup: "${ENABLE_BACKUPS:-true}"
entrypoint: /abra-lasuite-entrypoint.sh
configs:
- source: abra_lasuite_entrypoint
target: /abra-lasuite-entrypoint.sh
mode: 0555
secrets:
- django_secret_key
- oidc_rp_client_secret
- django_superuser_password
- collaboration_server_secret
- minio_root_password
- postgres_password
- db_password
web:
image: nginx:1.29
@ -240,7 +274,7 @@ configs:
name: ${STACK_NAME}_pg_backup_${PG_BACKUP_VERSION}
file: pg_backup.sh
abra_lasuite_entrypoint:
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
name: ${STACK_NAME}_entrypoint_${ABRA_LASUITE_ENTRYPOINT_VERSION}
file: entrypoint.sh
secrets:
@ -252,4 +286,16 @@ secrets:
name: ${STACK_NAME}_oidc_rp_client_secret_${SECRET_OIDC_RP_CLIENT_SECRET_VERSION}
django_superuser_password:
external: true
name: ${STACK_NAME}_django_superuser_password_${SECRET_DJANGO_SUPERUSER_PASSWORD_VERSION}
name: ${STACK_NAME}_django_superuser_password_${SECRET_DJANGO_SUPERUSER_PASSWORD_VERSION}
postgres_password:
external: true
name: ${STACK_NAME}_postgres_password_${SECRET_POSTGRES_PASSWORD_VERSION}
db_password:
external: true
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
collaboration_server_secret:
external: true
name: ${STACK_NAME}_collaboration_server_secret_${SECRET_COLLABORATION_SERVER_SECRET_VERSION}
minio_root_password:
external: true
name: ${STACK_NAME}_minio_root_password_${SECRET_MINIO_ROOT_PASSWORD_VERSION}