Merge pull request #4724 from Winne4r/main

fix: broken trigger.dev templates

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

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
@@ -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:
@@ -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:
+      - '127.0.0.1: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