diff --git a/hosting/docker/core/.env b/hosting/docker/core/.env index 5ab77d4..ac269fe 100644 --- a/hosting/docker/core/.env +++ b/hosting/docker/core/.env @@ -54,4 +54,4 @@ MODEL=gpt-4.1-2025-04-14 ## Trigger ## TRIGGER_PROJECT_ID=proj_core TRIGGER_SECRET_KEY=tr_prod_1yvnRh3pA1M2E67GBY7m -TRIGGER_API_URL=http://trigger-webapp:8030 +TRIGGER_API_URL=http://trigger-webapp:3000 diff --git a/hosting/docker/core/docker-compose.yaml b/hosting/docker/core/docker-compose.yaml index 59b67d8..c857c59 100644 --- a/hosting/docker/core/docker-compose.yaml +++ b/hosting/docker/core/docker-compose.yaml @@ -41,7 +41,6 @@ services: condition: service_healthy networks: - core - - trigger-webapp postgres: container_name: core-postgres @@ -101,8 +100,6 @@ networks: core: name: core-network driver: bridge - trigger-webapp: - external: true volumes: postgres_data: diff --git a/hosting/docker/trigger/docker-compose.yaml b/hosting/docker/trigger/docker-compose.yaml index 886e7a8..d0abc8f 100644 --- a/hosting/docker/trigger/docker-compose.yaml +++ b/hosting/docker/trigger/docker-compose.yaml @@ -20,7 +20,7 @@ services: - TRIGGER_TASKS_IMAGE=${TRIGGER_TASKS_IMAGE} - NODE_ENV=production networks: - - trigger-webapp + - webapp - core-network webapp: @@ -37,7 +37,7 @@ services: condition: service_started networks: - - trigger-webapp + - webapp - supervisor - core-network volumes: @@ -69,7 +69,7 @@ services: MAGIC_LINK_SECRET: ${MAGIC_LINK_SECRET} ENCRYPTION_KEY: ${ENCRYPTION_KEY} MANAGED_WORKER_SECRET: ${MANAGED_WORKER_SECRET} - REDIS_HOST: host.docker.internal + REDIS_HOST: core-redis REDIS_PORT: 6379 REDIS_TLS_DISABLED: true APP_LOG_LEVEL: info @@ -108,7 +108,7 @@ services: restart: ${RESTART_POLICY:-unless-stopped} logging: *logging-config networks: - - trigger-webapp + - webapp - core-network environment: DATABASE_URL: ${ELECTRIC_DATABASE_URL:-postgresql://postgres:postgres@postgres:5432/main?schema=public&sslmode=disable} @@ -136,7 +136,7 @@ services: - clickhouse:/bitnami/clickhouse - ../clickhouse/override.xml:/bitnami/clickhouse/etc/config.d/override.xml:ro networks: - - trigger-webapp + - webapp healthcheck: test: [ @@ -169,7 +169,7 @@ services: networks: - supervisor - docker-proxy - - trigger-webapp + - webapp - core-network volumes: - shared:/home/node/shared @@ -244,6 +244,7 @@ networks: supervisor: name: supervisor webapp: - name: trigger-webapp + name: webapp + driver: bridge core-network: external: true