From dd0575a1ac895545dbba3d2dc24f34c6aa9462eb Mon Sep 17 00:00:00 2001 From: JhumanJ Date: Fri, 31 Oct 2025 17:40:04 +0100 Subject: [PATCH] Update opnform.yaml to use version 1.10.1 for API and UI images, and correct APP_URL environment variable reference --- templates/compose/opnform.yaml | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/templates/compose/opnform.yaml b/templates/compose/opnform.yaml index 860b72eca..7e311e5a6 100644 --- a/templates/compose/opnform.yaml +++ b/templates/compose/opnform.yaml @@ -9,7 +9,7 @@ x-shared-env: &shared-api-env APP_ENV: production APP_KEY: ${SERVICE_BASE64_APIKEY} APP_DEBUG: ${APP_DEBUG:-false} - APP_URL: ${SERVICE_FQDN_NGINX} + APP_URL: ${SERVICE_FQDN_OPNFORM} SELF_HOSTED: ${SELF_HOSTED:-true} LOG_CHANNEL: errorlog LOG_LEVEL: ${LOG_LEVEL:-debug} @@ -50,7 +50,7 @@ x-shared-env: &shared-api-env services: opnform-api: - image: jhumanj/opnform-api:1.10.0 + image: jhumanj/opnform-api:1.10.1 volumes: - api-storage:/usr/share/nginx/html/storage environment: @@ -77,7 +77,7 @@ services: start_period: 60s api-worker: - image: jhumanj/opnform-api:1.10.0 + image: jhumanj/opnform-api:1.10.1 volumes: - api-storage:/usr/share/nginx/html/storage environment: @@ -90,14 +90,15 @@ services: redis: condition: service_healthy healthcheck: - test: ["CMD-SHELL", "pgrep -f 'php artisan queue:work' > /dev/null || exit 1"] + test: + ["CMD-SHELL", "pgrep -f 'php artisan queue:work' > /dev/null || exit 1"] interval: 60s timeout: 10s retries: 3 start_period: 30s - + api-scheduler: - image: jhumanj/opnform-api:1.10.0 + image: jhumanj/opnform-api:1.10.1 volumes: - api-storage:/usr/share/nginx/html/storage environment: @@ -110,14 +111,18 @@ services: redis: condition: service_healthy healthcheck: - test: ["CMD-SHELL", "php /usr/share/nginx/html/artisan app:scheduler-status --mode=check --max-minutes=3 || exit 1"] + test: + [ + "CMD-SHELL", + "php /usr/share/nginx/html/artisan app:scheduler-status --mode=check --max-minutes=3 || exit 1", + ] interval: 60s timeout: 30s retries: 3 start_period: 70s # Allow time for first scheduled run and cache write opnform-ui: - image: jhumanj/opnform-client:1.10.0 + image: jhumanj/opnform-client:1.10.1 environment: NUXT_PUBLIC_APP_URL: ${NUXT_PUBLIC_APP_URL:-/} NUXT_PUBLIC_API_BASE: ${NUXT_PUBLIC_API_BASE:-/api} @@ -127,7 +132,8 @@ services: NUXT_PUBLIC_RE_CAPTCHA_SITE_KEY: ${RE_CAPTCHA_SITE_KEY} NUXT_PUBLIC_ROOT_REDIRECT_URL: ${NUXT_PUBLIC_ROOT_REDIRECT_URL} healthcheck: - test: ["CMD-SHELL", "wget --spider -q http://opnform-ui:3000/login || exit 1"] + test: + ["CMD-SHELL", "wget --spider -q http://opnform-ui:3000/login || exit 1"] interval: 30s timeout: 10s retries: 3 @@ -214,7 +220,7 @@ services: } } environment: - - SERVICE_FQDN_NGINX + - SERVICE_FQDN_OPNFORM depends_on: - opnform-api - opnform-ui