From cf361e08a05f2eead40e1af209abffde7b5dddd2 Mon Sep 17 00:00:00 2001 From: Viktor Date: Thu, 2 Jan 2025 17:04:38 +0200 Subject: [PATCH 1/5] FIX: trigger.dev templates - wrong key length issue --- templates/compose/trigger-with-external-database.yaml | 6 +++--- templates/compose/trigger.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/compose/trigger-with-external-database.yaml b/templates/compose/trigger-with-external-database.yaml index 82c459430..bb6f17f20 100644 --- a/templates/compose/trigger-with-external-database.yaml +++ b/templates/compose/trigger-with-external-database.yaml @@ -11,9 +11,9 @@ services: - SERVICE_FQDN_TRIGGER_3000 - LOGIN_ORIGIN=$SERVICE_FQDN_TRIGGER - APP_ORIGIN=$SERVICE_FQDN_TRIGGER - - MAGIC_LINK_SECRET=$SERVICE_PASSWORD_64_MAGIC - - ENCRYPTION_KEY=$SERVICE_PASSWORD_64_ENCRYPTION - - SESSION_SECRET=$SERVICE_PASSWORD_64_SESSION + - MAGIC_LINK_SECRET=$SERVICE_PASSWORD_32_MAGIC + - ENCRYPTION_KEY=$SERVICE_PASSWORD_32_ENCRYPTION + - SESSION_SECRET=$SERVICE_PASSWORD_32_SESSION - DATABASE_URL=${DATABASE_URL:?} - DIRECT_URL=${DATABASE_URL:?} - RUNTIME_PLATFORM=docker-compose diff --git a/templates/compose/trigger.yaml b/templates/compose/trigger.yaml index 83aa0dfe0..c3df8d10d 100644 --- a/templates/compose/trigger.yaml +++ b/templates/compose/trigger.yaml @@ -14,9 +14,9 @@ x-common-env: &common-env POSTGRES_USER: $SERVICE_USER_POSTGRES POSTGRES_PASSWORD: $SERVICE_PASSWORD_POSTGRES POSTGRES_DB: ${POSTGRES_DB:-trigger} - MAGIC_LINK_SECRET: $SERVICE_PASSWORD_64_MAGIC - SESSION_SECRET: $SERVICE_PASSWORD_64_SESSION - ENCRYPTION_KEY: $SERVICE_PASSWORD_64_ENCRYPTION + MAGIC_LINK_SECRET: $SERVICE_PASSWORD_32_MAGIC + SESSION_SECRET: $SERVICE_PASSWORD_32_SESSION + ENCRYPTION_KEY: $SERVICE_PASSWORD_32_ENCRYPTION PROVIDER_SECRET: $SERVICE_PASSWORD_64_PROVIDER COORDINATOR_SECRET: $SERVICE_PASSWORD_64_COORDINATOR DATABASE_HOST: postgresql:5432 From 5fcf3aa7dc84a533e706faecb174f9d765d8040a Mon Sep 17 00:00:00 2001 From: Viktor Date: Fri, 3 Jan 2025 18:31:06 +0200 Subject: [PATCH 2/5] FIX: trigger.dev template - missing ports and wrong env usage --- templates/compose/trigger.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/templates/compose/trigger.yaml b/templates/compose/trigger.yaml index c3df8d10d..4e20524a5 100644 --- a/templates/compose/trigger.yaml +++ b/templates/compose/trigger.yaml @@ -119,13 +119,16 @@ services: PLATFORM_HOST: trigger PLATFORM_WS_PORT: 3000 SECURE_CONNECTION: "false" - PLATFORM_SECRET: $PROVIDER_SECRET + PLATFORM_SECRET: $SERVICE_PASSWORD_64_PROVIDER + HTTP_SERVER_PORT: 9020 coordinator: image: ghcr.io/triggerdotdev/coordinator:v3 platform: linux/amd64 volumes: - /var/run/docker.sock:/var/run/docker.sock user: root + ports: + - '9020:9020' depends_on: trigger: condition: service_healthy @@ -134,7 +137,8 @@ services: PLATFORM_HOST: trigger PLATFORM_WS_PORT: 3000 SECURE_CONNECTION: "false" - PLATFORM_SECRET: $COORDINATOR_SECRET + PLATFORM_SECRET: $SERVICE_PASSWORD_64_COORDINATOR + HTTP_SERVER_PORT: 9020 healthcheck: test: - CMD-SHELL From 87d324170d6993f25b9c41c1e5aa8006386429f8 Mon Sep 17 00:00:00 2001 From: Viktor Date: Fri, 3 Jan 2025 22:04:37 +0200 Subject: [PATCH 3/5] FIX: trigger.dev template - fixed otel config --- templates/compose/trigger.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/compose/trigger.yaml b/templates/compose/trigger.yaml index 4e20524a5..379ac5b75 100644 --- a/templates/compose/trigger.yaml +++ b/templates/compose/trigger.yaml @@ -43,7 +43,7 @@ x-common-env: &common-env LOGIN_ORIGIN: $SERVICE_FQDN_TRIGGER_3000 APP_ORIGIN: $SERVICE_FQDN_TRIGGER_3000 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 services: From f0ea3893312a4da93f871138e4529b5cba2f6a02 Mon Sep 17 00:00:00 2001 From: Viktor Date: Fri, 3 Jan 2025 22:04:37 +0200 Subject: [PATCH 4/5] FIX: trigger.dev template - fixed otel config --- templates/compose/trigger.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/compose/trigger.yaml b/templates/compose/trigger.yaml index 4e20524a5..769366087 100644 --- a/templates/compose/trigger.yaml +++ b/templates/compose/trigger.yaml @@ -43,7 +43,7 @@ x-common-env: &common-env LOGIN_ORIGIN: $SERVICE_FQDN_TRIGGER_3000 APP_ORIGIN: $SERVICE_FQDN_TRIGGER_3000 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 services: From 350fd52b20882d2a4df6227fed408d39abb9c885 Mon Sep 17 00:00:00 2001 From: Viktor Date: Fri, 17 Jan 2025 14:29:45 +0200 Subject: [PATCH 5/5] FIX: trigger.dev template - fixed port config --- templates/compose/trigger.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/compose/trigger.yaml b/templates/compose/trigger.yaml index 769366087..ae645e112 100644 --- a/templates/compose/trigger.yaml +++ b/templates/compose/trigger.yaml @@ -128,7 +128,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock user: root ports: - - '9020:9020' + - '127.0.0.1:9020:9020' depends_on: trigger: condition: service_healthy