Attempt at universal abra wrapper

This commit is contained in:
2025-11-01 16:26:05 -04:00
parent 664d0df1f6
commit 293dd80e53
3 changed files with 47 additions and 28 deletions

View File

@ -115,10 +115,11 @@ services:
retries: 20
start_period: 10s
command: ["gunicorn", "-c", "/usr/local/etc/gunicorn/impress.py", "impress.wsgi:application"]
entrypoint: /abra-lasuite-entrypoint.sh
# entrypoint: "/abra-entrypoint.sh"
entrypoint: ["/abra-entrypoint.sh", "/usr/local/bin/entrypoint"]
configs:
- source: abra_lasuite_entrypoint
target: /abra-lasuite-entrypoint.sh
- source: abra_entrypoint
target: /abra-entrypoint.sh
mode: 0555
secrets:
- django_secret_key
@ -136,10 +137,10 @@ services:
command: ["celery", "-A", "impress.celery_app", "worker", "-l", "INFO"]
environment:
<<: [*common-env, *postgres-env, *yprovider-env]
entrypoint: /abra-lasuite-entrypoint.sh
entrypoint: ["/abra-entrypoint.sh", "/usr/local/bin/entrypoint"]
configs:
- source: abra_lasuite_entrypoint
target: /abra-lasuite-entrypoint.sh
- source: abra_entrypoint
target: /abra-entrypoint.sh
mode: 0555
secrets:
- django_secret_key
@ -156,6 +157,12 @@ services:
networks:
- backend
environment: *yprovider-env
command: ["yarn", "start"]
entrypoint: ["/abra-entrypoint.sh", "/usr/local/bin/entrypoint"]
configs:
- source: abra_entrypoint
target: /abra-entrypoint.sh
mode: 0555
# NOTE: healthcheck - `wget` is available in the container, but `wget http://localhost:4444` gives a 403
db:
@ -172,6 +179,8 @@ services:
PGDATA: var/lib/postgresql/data/pgdata
volumes:
- postgres:/var/lib/postgresql/data/pgdata
command: ["postgres"]
entrypoint: ["/abra-entrypoint.sh", "docker-entrypoint.sh"]
deploy:
labels:
backupbot.backup: "${ENABLE_BACKUPS:-true}"
@ -182,6 +191,9 @@ services:
- source: pg_backup
target: /pg_backup.sh
mode: 0555
- source: abra_entrypoint
target: /abra-entrypoint.sh
mode: 0555
redis:
image: redis:8
@ -219,15 +231,16 @@ services:
networks:
- backend
command: minio server /data
entrypoint: ["/abra-entrypoint.sh", "/usr/bin/docker-entrypoint.sh"]
volumes:
- minio:/data
deploy:
labels:
backupbot.backup: "${ENABLE_BACKUPS:-true}"
entrypoint: /abra-lasuite-entrypoint.sh
entrypoint: /abra-entrypoint.sh
configs:
- source: abra_lasuite_entrypoint
target: /abra-lasuite-entrypoint.sh
- source: abra_entrypoint
target: /abra-entrypoint.sh
mode: 0555
secrets:
- django_secret_key
@ -273,8 +286,8 @@ configs:
pg_backup:
name: ${STACK_NAME}_pg_backup_${PG_BACKUP_VERSION}
file: pg_backup.sh
abra_lasuite_entrypoint:
name: ${STACK_NAME}_entrypoint_${ABRA_LASUITE_ENTRYPOINT_VERSION}
abra_entrypoint:
name: ${STACK_NAME}_entrypoint_${ABRA_ENTRYPOINT_VERSION}
file: entrypoint.sh
secrets: