From f49e0f5158e1a0c697a04689177af99d80b059fb Mon Sep 17 00:00:00 2001 From: notplants Date: Tue, 2 Dec 2025 13:20:16 -0500 Subject: [PATCH 1/6] debugging --- abra-entrypoint.sh | 2 ++ abra.sh | 2 +- compose.yml | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/abra-entrypoint.sh b/abra-entrypoint.sh index 470e0dd..0022567 100644 --- a/abra-entrypoint.sh +++ b/abra-entrypoint.sh @@ -12,6 +12,8 @@ set -e [ -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 +echo "++ new entrypoint!" +echo "++ cmd: $@" if [ ! "$1" = "-e" ]; then exec "$@" fi \ No newline at end of file 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..05200b9 100644 --- a/compose.yml +++ b/compose.yml @@ -90,7 +90,7 @@ services: 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.2+v3.4.2" healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8080"] interval: 15s @@ -110,7 +110,8 @@ services: 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"] + command: ["tail", "-f", "/dev/null"] entrypoint: ["/abra-entrypoint.sh", "/usr/local/bin/entrypoint"] configs: - source: abra_entrypoint -- 2.49.0 From bd3c2c17d2c690be593faeed862f877d0dcb3300 Mon Sep 17 00:00:00 2001 From: notplants Date: Tue, 2 Dec 2025 19:51:18 -0500 Subject: [PATCH 2/6] debugging --- compose.yml | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/compose.yml b/compose.yml index 05200b9..daf677e 100644 --- a/compose.yml +++ b/compose.yml @@ -83,7 +83,7 @@ x-minio-env: &minio-env services: app: - image: lasuite/impress-frontend:v3.4.2 + image: lasuite/impress-frontend:v4.0.0 networks: - backend deploy: @@ -91,27 +91,32 @@ services: - "traefik.enable=false" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" - "coop-cloud.${STACK_NAME}.version=0.2.2+v3.4.2" - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080"] - interval: 15s - timeout: 30s - retries: 20 - start_period: 10s +# healthcheck: +# test: ["CMD", "curl", "-f", "http://localhost:8080"] +# interval: 15s +# timeout: 30s +# retries: 20 +# start_period: 10s backend: - image: lasuite/impress-backend:v3.4.2 + image: lasuite/impress-backend:v4.0.0 networks: - backend environment: <<: [*common-env, *postgres-env, *yprovider-env] - healthcheck: - test: ["CMD", "/abra-entrypoint.sh", "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: ["tail", "-f", "/dev/null"] +# healthcheck: +# test: ["CMD", "/abra-entrypoint.sh", "python", "manage.py", "check"] +# interval: 15s +# timeout: 30s +# retries: 20 +# start_period: 10s +# healthcheck: +# 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"] entrypoint: ["/abra-entrypoint.sh", "/usr/local/bin/entrypoint"] configs: - source: abra_entrypoint @@ -129,7 +134,7 @@ services: - email_pass celery: - image: lasuite/impress-backend:v3.4.2 + image: lasuite/impress-backend:v4.0.0 networks: - backend command: ["celery", "-A", "impress.celery_app", "worker", "-l", "INFO"] -- 2.49.0 From 41c73faa24eb41dad5e52008c3d43fa4555da4e3 Mon Sep 17 00:00:00 2001 From: notplants Date: Tue, 2 Dec 2025 20:33:41 -0500 Subject: [PATCH 3/6] Working by adding user:1000 to recipe --- abra-entrypoint.sh | 2 -- compose.yml | 43 ++++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/abra-entrypoint.sh b/abra-entrypoint.sh index 0022567..470e0dd 100644 --- a/abra-entrypoint.sh +++ b/abra-entrypoint.sh @@ -12,8 +12,6 @@ set -e [ -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 -echo "++ new entrypoint!" -echo "++ cmd: $@" if [ ! "$1" = "-e" ]; then exec "$@" fi \ No newline at end of file diff --git a/compose.yml b/compose.yml index daf677e..599fa7a 100644 --- a/compose.yml +++ b/compose.yml @@ -55,6 +55,9 @@ x-common-env: &common-env AI_MODEL: llama # Collaboration COLLABORATION_API_URL: https://$DOMAIN/collaboration/api/ + # docker username + USER_NAME: "dockeruser" + HOME: "/home/dockeruser" x-postgres-env: &postgres-env # Postgresql db container configuration @@ -91,12 +94,13 @@ services: - "traefik.enable=false" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" - "coop-cloud.${STACK_NAME}.version=0.2.2+v3.4.2" -# healthcheck: -# test: ["CMD", "curl", "-f", "http://localhost:8080"] -# interval: 15s -# timeout: 30s -# retries: 20 -# start_period: 10s + user: "${DOCKER_USER:-1000}" + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:8080"] + interval: 15s + timeout: 30s + retries: 20 + start_period: 10s backend: image: lasuite/impress-backend:v4.0.0 @@ -104,18 +108,13 @@ services: - backend environment: <<: [*common-env, *postgres-env, *yprovider-env] -# healthcheck: -# test: ["CMD", "/abra-entrypoint.sh", "python", "manage.py", "check"] -# interval: 15s -# timeout: 30s -# retries: 20 -# start_period: 10s -# healthcheck: -# test: ["CMD-SHELL", "/abra-entrypoint.sh", "/usr/local/bin/entrypoint", "python", "manage.py", "check"] -# interval: 15s -# timeout: 30s -# retries: 20 -# start_period: 10s + healthcheck: + test: ["CMD", "/abra-entrypoint.sh", "python", "manage.py", "check"] + interval: 15s + 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: @@ -136,7 +135,8 @@ services: celery: 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] @@ -157,10 +157,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"] @@ -232,7 +233,7 @@ services: timeout: 20s retries: 300 networks: - - backend + - backend command: minio server /data entrypoint: ["/usr/bin/docker-entrypoint.sh"] volumes: -- 2.49.0 From 163eea1ba7135a1c65e1605ba402e058738e13ab Mon Sep 17 00:00:00 2001 From: notplants Date: Tue, 2 Dec 2025 21:13:27 -0500 Subject: [PATCH 4/6] remove unnecessary --- compose.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/compose.yml b/compose.yml index 599fa7a..c1eca72 100644 --- a/compose.yml +++ b/compose.yml @@ -55,9 +55,6 @@ x-common-env: &common-env AI_MODEL: llama # Collaboration COLLABORATION_API_URL: https://$DOMAIN/collaboration/api/ - # docker username - USER_NAME: "dockeruser" - HOME: "/home/dockeruser" x-postgres-env: &postgres-env # Postgresql db container configuration -- 2.49.0 From 1962ab7c8f38ccdf738c13eaed23cc16cfc42be9 Mon Sep 17 00:00:00 2001 From: notplants Date: Tue, 2 Dec 2025 21:13:46 -0500 Subject: [PATCH 5/6] update version number --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index c1eca72..32595e2 100644 --- a/compose.yml +++ b/compose.yml @@ -90,7 +90,7 @@ services: labels: - "traefik.enable=false" - "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+v4.0.0" user: "${DOCKER_USER:-1000}" healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8080"] -- 2.49.0 From 80adfcafdcc8c1c08831973be60ae9d7946f7759 Mon Sep 17 00:00:00 2001 From: notplants Date: Wed, 3 Dec 2025 15:11:49 -0500 Subject: [PATCH 6/6] update label --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 32595e2..c567ffb 100644 --- a/compose.yml +++ b/compose.yml @@ -90,7 +90,7 @@ services: labels: - "traefik.enable=false" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" - - "coop-cloud.${STACK_NAME}.version=0.2.2+v4.0.0" + - "coop-cloud.${STACK_NAME}.version=0.2.3+v4.0.0" user: "${DOCKER_USER:-1000}" healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8080"] -- 2.49.0