diff --git a/abra.sh b/abra.sh index 7880bff..055ab38 100755 --- a/abra.sh +++ b/abra.sh @@ -1,6 +1,6 @@ # Set any config versions here # Docs: https://docs.coopcloud.tech/maintainers/handbook/#manage-configs -export ABRA_ENTRYPOINT_VERSION=v4 +export ABRA_ENTRYPOINT_VERSION=v5 export NGINX_CONF_VERSION=v3 export PG_BACKUP_VERSION=v3 diff --git a/compose.yml b/compose.yml index 335d227..c567ffb 100644 --- a/compose.yml +++ b/compose.yml @@ -83,14 +83,15 @@ x-minio-env: &minio-env services: app: - image: lasuite/impress-frontend:v3.4.2 + image: lasuite/impress-frontend:v4.0.0 networks: - backend deploy: labels: - "traefik.enable=false" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" - - "coop-cloud.${STACK_NAME}.version=0.2.1+v3.4.2" + - "coop-cloud.${STACK_NAME}.version=0.2.3+v4.0.0" + user: "${DOCKER_USER:-1000}" healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8080"] interval: 15s @@ -99,7 +100,7 @@ services: start_period: 10s backend: - image: lasuite/impress-backend:v3.4.2 + image: lasuite/impress-backend:v4.0.0 networks: - backend environment: @@ -110,6 +111,7 @@ services: timeout: 30s retries: 20 start_period: 10s + user: "${DOCKER_USER:-1000}" command: ["gunicorn", "-c", "/usr/local/etc/gunicorn/impress.py", "impress.wsgi:application"] entrypoint: ["/abra-entrypoint.sh", "/usr/local/bin/entrypoint"] configs: @@ -128,9 +130,10 @@ services: - email_pass celery: - image: lasuite/impress-backend:v3.4.2 + image: lasuite/impress-backend:v4.0.0 networks: - - backend + - backend + user: "${DOCKER_USER:-1000}" command: ["celery", "-A", "impress.celery_app", "worker", "-l", "INFO"] environment: <<: [*common-env, *postgres-env, *yprovider-env] @@ -151,10 +154,11 @@ services: y-provider: - image: lasuite/impress-y-provider:v3.4.2 + image: lasuite/impress-y-provider:v4.0.0 networks: - backend environment: *yprovider-env + user: "${DOCKER_USER:-1000}" entrypoint: > sh -c "export Y_PROVIDER_API_KEY=\"$$(cat /run/secrets/y_api_key)\" && exec /usr/local/bin/entrypoint \"$$@\"" -- command: ["yarn", "start"] @@ -226,7 +230,7 @@ services: timeout: 20s retries: 300 networks: - - backend + - backend command: minio server /data entrypoint: ["/usr/bin/docker-entrypoint.sh"] volumes: