From c034035aba2296e60b2331dcea2a92ffecd42d4b Mon Sep 17 00:00:00 2001 From: Eric Allam Date: Thu, 22 Jun 2023 16:09:03 +0100 Subject: [PATCH] Working on deploying to fly --- apps/webapp/prisma/seed.ts | 5 ++--- deploy/fly.toml | 5 ++++- docker/scripts/entrypoint.sh | 5 ++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/apps/webapp/prisma/seed.ts b/apps/webapp/prisma/seed.ts index 6e6fb5b9e..369a95f72 100644 --- a/apps/webapp/prisma/seed.ts +++ b/apps/webapp/prisma/seed.ts @@ -1,9 +1,8 @@ /* eslint-disable turbo/no-undeclared-env-vars */ -import { PrismaClient } from "@trigger.dev/database"; + import { integrationCatalog } from "../app/services/externalApis/integrationCatalog.server"; import { seedCloud } from "./seedCloud"; - -const prisma = new PrismaClient(); +import { prisma } from "../app/db.server"; async function seedIntegrationAuthMethods() { for (const [identifier, integration] of Object.entries( diff --git a/deploy/fly.toml b/deploy/fly.toml index dbbfed114..e80617fb3 100644 --- a/deploy/fly.toml +++ b/deploy/fly.toml @@ -6,6 +6,9 @@ app = "trigger-v2-fly-demo" primary_region = "lhr" +[env] +PRIMARY_REGION = "lhr" + [build] image = "ghcr.io/triggerdotdev/trigger.dev:latest" @@ -14,4 +17,4 @@ primary_region = "lhr" force_https = true auto_stop_machines = true auto_start_machines = true - min_machines_running = 0 + min_machines_running = 0 \ No newline at end of file diff --git a/docker/scripts/entrypoint.sh b/docker/scripts/entrypoint.sh index a7e6cf49d..4e6e66fb8 100755 --- a/docker/scripts/entrypoint.sh +++ b/docker/scripts/entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -x -scripts/wait-for-it.sh ${DATABASE_HOST}:5432 -- echo "database is up" +if [ -n "$DATABASE_HOST" ]; then + scripts/wait-for-it.sh ${DATABASE_HOST} -- echo "database is up" +fi + npx prisma migrate deploy --schema /triggerdotdev/packages/database/prisma/schema.prisma npx ts-node@latest --transpile-only /triggerdotdev/apps/webapp/prisma/seed.ts npx turbo run start