dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #4724 from Winne4r/main

Browse Source 
fix: broken trigger.dev templates
This commit is contained in:
Andras Bacsai
2025-01-28 11:59:08 +01:00
committed by GitHub
parent 06adb41f16 350fd52b20
commit 53feec8cff
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/compose/trigger-with-external-database.yaml
View File

@@ -11,9 +11,9 @@ services:
- SERVICE_FQDN_TRIGGER_3000 - SERVICE_FQDN_TRIGGER_3000
- LOGIN_ORIGIN=$SERVICE_FQDN_TRIGGER - LOGIN_ORIGIN=$SERVICE_FQDN_TRIGGER
- APP_ORIGIN=$SERVICE_FQDN_TRIGGER - APP_ORIGIN=$SERVICE_FQDN_TRIGGER
- MAGIC_LINK_SECRET=$SERVICE_PASSWORD_64_MAGIC - MAGIC_LINK_SECRET=$SERVICE_PASSWORD_32_MAGIC
- ENCRYPTION_KEY=$SERVICE_PASSWORD_64_ENCRYPTION - ENCRYPTION_KEY=$SERVICE_PASSWORD_32_ENCRYPTION
- SESSION_SECRET=$SERVICE_PASSWORD_64_SESSION - SESSION_SECRET=$SERVICE_PASSWORD_32_SESSION
- DATABASE_URL=${DATABASE_URL:?} - DATABASE_URL=${DATABASE_URL:?}
- DIRECT_URL=${DATABASE_URL:?} - DIRECT_URL=${DATABASE_URL:?}
- RUNTIME_PLATFORM=docker-compose - RUNTIME_PLATFORM=docker-compose

16
templates/compose/trigger.yaml
View File

@@ -14,9 +14,9 @@ x-common-env: &common-env
POSTGRES_USER: $SERVICE_USER_POSTGRES POSTGRES_USER: $SERVICE_USER_POSTGRES
POSTGRES_PASSWORD: $SERVICE_PASSWORD_POSTGRES POSTGRES_PASSWORD: $SERVICE_PASSWORD_POSTGRES
POSTGRES_DB: ${POSTGRES_DB:-trigger} POSTGRES_DB: ${POSTGRES_DB:-trigger}
MAGIC_LINK_SECRET: $SERVICE_PASSWORD_64_MAGIC MAGIC_LINK_SECRET: $SERVICE_PASSWORD_32_MAGIC
SESSION_SECRET: $SERVICE_PASSWORD_64_SESSION SESSION_SECRET: $SERVICE_PASSWORD_32_SESSION
ENCRYPTION_KEY: $SERVICE_PASSWORD_64_ENCRYPTION ENCRYPTION_KEY: $SERVICE_PASSWORD_32_ENCRYPTION
PROVIDER_SECRET: $SERVICE_PASSWORD_64_PROVIDER PROVIDER_SECRET: $SERVICE_PASSWORD_64_PROVIDER
COORDINATOR_SECRET: $SERVICE_PASSWORD_64_COORDINATOR COORDINATOR_SECRET: $SERVICE_PASSWORD_64_COORDINATOR
DATABASE_HOST: postgresql:5432 DATABASE_HOST: postgresql:5432
@@ -43,7 +43,7 @@ x-common-env: &common-env
LOGIN_ORIGIN: $SERVICE_FQDN_TRIGGER_3000 LOGIN_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
APP_ORIGIN: $SERVICE_FQDN_TRIGGER_3000 APP_ORIGIN: $SERVICE_FQDN_TRIGGER_3000
DEV_OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel DEV_OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
OTEL_EXPORTER_OTLP_ENDPOINT: "http://trigger:3040/otel" OTEL_EXPORTER_OTLP_ENDPOINT: $SERVICE_FQDN_TRIGGER_3000/otel
ELECTRIC_ORIGIN: http://electric:3000 ELECTRIC_ORIGIN: http://electric:3000
services: services:
@@ -119,13 +119,16 @@ services:
PLATFORM_HOST: trigger PLATFORM_HOST: trigger
PLATFORM_WS_PORT: 3000 PLATFORM_WS_PORT: 3000
SECURE_CONNECTION: "false" SECURE_CONNECTION: "false"
PLATFORM_SECRET: $PROVIDER_SECRET PLATFORM_SECRET: $SERVICE_PASSWORD_64_PROVIDER
HTTP_SERVER_PORT: 9020
coordinator: coordinator:
image: ghcr.io/triggerdotdev/coordinator:v3 image: ghcr.io/triggerdotdev/coordinator:v3
platform: linux/amd64 platform: linux/amd64
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
user: root user: root
ports:
- '127.0.0.1:9020:9020'
depends_on: depends_on:
trigger: trigger:
condition: service_healthy condition: service_healthy
@@ -134,7 +137,8 @@ services:
PLATFORM_HOST: trigger PLATFORM_HOST: trigger
PLATFORM_WS_PORT: 3000 PLATFORM_WS_PORT: 3000
SECURE_CONNECTION: "false" SECURE_CONNECTION: "false"
PLATFORM_SECRET: $COORDINATOR_SECRET PLATFORM_SECRET: $SERVICE_PASSWORD_64_COORDINATOR
HTTP_SERVER_PORT: 9020
healthcheck: healthcheck:
test: test:
- CMD-SHELL - CMD-SHELL