From 759eff464d8581fa37e4bb575459bdf79a421e16 Mon Sep 17 00:00:00 2001 From: Bruno Frank Silva Cordeiro Date: Thu, 11 Jun 2026 09:54:16 -0300 Subject: [PATCH] Fix URLS and health or crm when booting procesor. --- blueprints/evolutioncrm/docker-compose.yml | 45 +++++++++++----------- blueprints/evolutioncrm/template.toml | 4 ++ 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/blueprints/evolutioncrm/docker-compose.yml b/blueprints/evolutioncrm/docker-compose.yml index b143aeeb..794b3c11 100644 --- a/blueprints/evolutioncrm/docker-compose.yml +++ b/blueprints/evolutioncrm/docker-compose.yml @@ -21,9 +21,9 @@ services: - POSTGRES_DATABASE=evo_crm_production - POSTGRES_SSLMODE=disable - REDIS_URL=${REDIS_URL} - - FRONTEND_URL=https://${FRONT_DOMAIN} - - BACKEND_URL=https://${BACK_DOMAIN} - - CORS_ORIGINS=${FRONT_DOMAIN},${BACK_DOMAIN} + - FRONTEND_URL=${FRONT_URL} + - BACKEND_URL=${BACK_URL} + - CORS_ORIGINS=${FRONT_URL},${BACK_URL} - DOORKEEPER_JWT_SECRET_KEY=${DOORKEEPER_JWT_SECRET_KEY} - DOORKEEPER_JWT_ALGORITHM=${DOORKEEPER_JWT_ALGORITHM} - DOORKEEPER_JWT_ISS=${DOORKEEPER_JWT_ISS} @@ -62,8 +62,6 @@ services: image: evoapicloud/evo-ai-crm-community:latest command: sh -c "bundle exec rails db:prepare && bundle exec rails s -p 3000 -b 0.0.0.0" restart: always - healthcheck: - disable: true depends_on: postgres: condition: service_healthy @@ -83,11 +81,11 @@ services: - POSTGRES_DATABASE=evo_crm_production - POSTGRES_SSLMODE=disable - REDIS_URL=${REDIS_URL} - - EVO_AUTH_SERVICE_URL=http://${AUTH_DOMAIN} + - EVO_AUTH_SERVICE_URL=${AUTH_URL} - EVO_AI_CORE_SERVICE_URL=http://evo-core:5555 - - BACKEND_URL=http://${BACK_DOMAIN} - - FRONTEND_URL=https://${FRONT_DOMAIN} - - CORS_ORIGINS=https://${FRONT_DOMAIN},https://${BACK_DOMAIN},https://${AUTH_DOMAIN} + - BACKEND_URL=${BACK_URL} + - FRONTEND_URL=${FRONT_URL} + - CORS_ORIGINS=${FRONT_URL},${BACK_URL},${AUTH_URL} - DISABLE_TELEMETRY=true - LOG_LEVEL=info - ENABLE_ACCOUNT_SIGNUP=true @@ -95,7 +93,7 @@ services: - ENABLE_INBOX_EVENTS=true - BOT_RUNTIME_URL=http://evo-bot-runtime:8080 - BOT_RUNTIME_SECRET=${BOT_RUNTIME_SECRET} - - BOT_RUNTIME_POSTBACK_BASE_URL=http://${BACK_DOMAIN} + - BOT_RUNTIME_POSTBACK_BASE_URL=${BACK_URL} volumes: - evo-crm-data:/app/storage @@ -114,11 +112,11 @@ services: - POSTGRES_DATABASE=evo_crm_production - POSTGRES_SSLMODE=disable - REDIS_URL=${REDIS_URL} - - EVO_AUTH_SERVICE_URL=http://${AUTH_DOMAIN} + - EVO_AUTH_SERVICE_URL=${AUTH_URL} - EVO_AI_CORE_SERVICE_URL=http://evo-core:5555 - - BACKEND_URL=http://${BACK_DOMAIN} - - FRONTEND_URL=https://${FRONT_DOMAIN} - - CORS_ORIGINS=https://${FRONT_DOMAIN},https://${BACK_DOMAIN},https://${AUTH_DOMAIN} + - BACKEND_URL=${BACK_URL} + - FRONTEND_URL=${FRONT_URL} + - CORS_ORIGINS=${FRONT_URL},${BACK_URL},${AUTH_URL} - DISABLE_TELEMETRY=true - LOG_LEVEL=info - ENABLE_ACCOUNT_SIGNUP=true @@ -126,7 +124,7 @@ services: - ENABLE_INBOX_EVENTS=true - BOT_RUNTIME_URL=http://evo-bot-runtime:8080 - BOT_RUNTIME_SECRET=${BOT_RUNTIME_SECRET} - - BOT_RUNTIME_POSTBACK_BASE_URL=http://${BACK_DOMAIN} + - BOT_RUNTIME_POSTBACK_BASE_URL=${BACK_URL} - SIDEKIQ_CONCURRENCY=10 evo-core: @@ -163,6 +161,8 @@ services: condition: service_healthy redis: condition: service_healthy + evo-crm: + condition: service_healthy environment: - POSTGRES_CONNECTION_STRING=postgresql://postgres:${POSTGRES_PASSWORD}@postgres:5432/evo_crm_production - REDIS_HOST=redis @@ -181,8 +181,8 @@ services: - EVO_AI_CRM_URL=http://evo-crm:3000 - CORE_SERVICE_URL=http://evo-core:5555/api/v1 - EVO_AUTH_BASE_URL=http://evo-auth:3001 - - APP_URL=https://${PROCESSOR_DOMAIN} - - API_URL=https://${PROCESSOR_DOMAIN} + - APP_URL=${PROCESSOR_URL} + - API_URL=${PROCESSOR_URL} - API_TITLE=Agent Processor Community - API_DESCRIPTION=Agent Processor Community for Evolution AI - API_VERSION=1.0.0 @@ -203,11 +203,12 @@ services: image: evoapicloud/evo-ai-frontend-community:latest environment: - VITE_APP_ENV=production - - VITE_API_URL=https://${BACK_DOMAIN} - - VITE_AUTH_API_URL=http://${AUTH_DOMAIN} - - VITE_EVOAI_API_URL=https://${PROCESSOR_DOMAIN} - - VITE_AGENT_PROCESSOR_URL=https://${PROCESSOR_DOMAIN} - - VITE_WS_URL=wss://${BACK_DOMAIN} + - VITE_API_URL=${BACK_URL} + - VITE_AUTH_API_URL=${AUTH_URL} + - VITE_EVOAI_API_URL=${PROCESSOR_URL} + - VITE_AGENT_PROCESSOR_URL=${PROCESSOR_URL} + - VITE_WS_URL=wss://${BACK_URL} + - VITE_FRONT_URL=${FRONT_URL} postgres: image: postgres:16-alpine diff --git a/blueprints/evolutioncrm/template.toml b/blueprints/evolutioncrm/template.toml index a41bad6c..2cabfd9f 100644 --- a/blueprints/evolutioncrm/template.toml +++ b/blueprints/evolutioncrm/template.toml @@ -25,9 +25,13 @@ env = [ "REDIS_URL=redis://:${redis_password}@redis:6379/3", "REDIS_PASSWORD=${redis_password}", "FRONT_DOMAIN=${front_domain}", + "FRONT_URL=http://${front_domain}", "BACK_DOMAIN=${api_domain}", + "BACK_URL=http://${api_domain}", "AUTH_DOMAIN=${auth_domain}", + "AUTH_URL=http://${auth_domain}", "PROCESSOR_DOMAIN=${processor_domain}", + "PROCESSOR_URL=http://${processor_domain}", "DOORKEEPER_JWT_SECRET_KEY=${doorkeeper_jwt_secret_key}", "DOORKEEPER_JWT_ALGORITHM=hs256", "DOORKEEPER_JWT_ISS=evo-auth-service",