recipe-maintainers/lasuite-docs
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Working by adding user:1000 to recipe

Browse Source
This commit is contained in:
notplants
2025-12-02 20:33:41 -05:00
parent bd3c2c17d2
commit 41c73faa24
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
abra-entrypoint.sh
View File

@ -12,8 +12,6 @@ set -e
[ -f /run/secrets/email_pass ] && export DJANGO_EMAIL_HOST_PASSWORD="$(cat /run/secrets/email_pass)" [ -f /run/secrets/email_pass ] && export DJANGO_EMAIL_HOST_PASSWORD="$(cat /run/secrets/email_pass)"
# if not in "env" mode, then execute the original entrypoint and command # if not in "env" mode, then execute the original entrypoint and command
echo "++ new entrypoint!"
echo "++ cmd: $@"
if [ ! "$1" = "-e" ]; then if [ ! "$1" = "-e" ]; then
exec "$@" exec "$@"
fi fi

39
compose.yml
View File

@ -55,6 +55,9 @@ x-common-env: &common-env
AI_MODEL: llama AI_MODEL: llama
# Collaboration # Collaboration
COLLABORATION_API_URL: https://$DOMAIN/collaboration/api/ COLLABORATION_API_URL: https://$DOMAIN/collaboration/api/
# docker username
USER_NAME: "dockeruser"
HOME: "/home/dockeruser"
x-postgres-env: &postgres-env x-postgres-env: &postgres-env
# Postgresql db container configuration # Postgresql db container configuration
@ -91,12 +94,13 @@ services:
- "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.2+v3.4.2" - "coop-cloud.${STACK_NAME}.version=0.2.2+v3.4.2"
# healthcheck: user: "${DOCKER_USER:-1000}"
# test: ["CMD", "curl", "-f", "http://localhost:8080"] healthcheck:
# interval: 15s test: ["CMD", "curl", "-f", "http://localhost:8080"]
# timeout: 30s interval: 15s
# retries: 20 timeout: 30s
# start_period: 10s retries: 20
start_period: 10s
backend: backend:
image: lasuite/impress-backend:v4.0.0 image: lasuite/impress-backend:v4.0.0
@ -104,18 +108,13 @@ services:
- backend - backend
environment: environment:
<<: [*common-env, *postgres-env, *yprovider-env] <<: [*common-env, *postgres-env, *yprovider-env]
# healthcheck: healthcheck:
# test: ["CMD", "/abra-entrypoint.sh", "python", "manage.py", "check"] test: ["CMD", "/abra-entrypoint.sh", "python", "manage.py", "check"]
# interval: 15s interval: 15s
# timeout: 30s timeout: 30s
# retries: 20 retries: 20
# start_period: 10s start_period: 10s
# healthcheck: user: "${DOCKER_USER:-1000}"
# test: ["CMD-SHELL", "/abra-entrypoint.sh", "/usr/local/bin/entrypoint", "python", "manage.py", "check"]
# interval: 15s
# timeout: 30s
# retries: 20
# start_period: 10s
command: ["gunicorn", "-c", "/usr/local/etc/gunicorn/impress.py", "impress.wsgi:application"] command: ["gunicorn", "-c", "/usr/local/etc/gunicorn/impress.py", "impress.wsgi:application"]
entrypoint: ["/abra-entrypoint.sh", "/usr/local/bin/entrypoint"] entrypoint: ["/abra-entrypoint.sh", "/usr/local/bin/entrypoint"]
configs: configs:
@ -137,6 +136,7 @@ services:
image: lasuite/impress-backend:v4.0.0 image: lasuite/impress-backend:v4.0.0
networks: networks:
- backend - backend
user: "${DOCKER_USER:-1000}"
command: ["celery", "-A", "impress.celery_app", "worker", "-l", "INFO"] command: ["celery", "-A", "impress.celery_app", "worker", "-l", "INFO"]
environment: environment:
<<: [*common-env, *postgres-env, *yprovider-env] <<: [*common-env, *postgres-env, *yprovider-env]
@ -157,10 +157,11 @@ services:
y-provider: y-provider:
image: lasuite/impress-y-provider:v3.4.2 image: lasuite/impress-y-provider:v4.0.0
networks: networks:
- backend - backend
environment: *yprovider-env environment: *yprovider-env
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"]