From c20536cd96f1fcd23858fa79b94c4aff1abce52a Mon Sep 17 00:00:00 2001 From: Mike Conrad Date: Wed, 4 Jun 2025 20:27:13 -0400 Subject: [PATCH] Fix database connection in docker --- .env.example | 9 +++++---- compose.override.yml | 2 +- start/env.ts | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.env.example b/.env.example index e1b4fda..5f7cd59 100644 --- a/.env.example +++ b/.env.example @@ -1,12 +1,13 @@ TZ=UTC PORT=3333 -HOST=localhost +HOST=0.0.0.0 LOG_LEVEL=info -APP_KEY= +APP_KEY=sMoYEqixvC3sgJO4WM9ej9ctlcVtAdCE NODE_ENV=development SESSION_DRIVER=cookie +PG_USER=postgres PG_PORT=5432 -PG_HOST=localhost +PG_HOST=db PG_PASSWORD=password SENTRY_TOKEN= SENTRY_ORG= @@ -14,4 +15,4 @@ REDIS_HOST=sentry-redis-1 REDIS_PORT=6379 REDIS_PASSWORD= WEBHOOK_URL= -QUERY_FILTER='!user.email:*@mailinator.com !user.email:*@example.com' \ No newline at end of file +QUERY_FILTER='!user.email:*@mailinator.com !user.email:*@example.com' diff --git a/compose.override.yml b/compose.override.yml index 07ea303..7cd0b4d 100644 --- a/compose.override.yml +++ b/compose.override.yml @@ -8,7 +8,7 @@ services: volumes: - ./:/app - node_modules:/app/node_modules - command: /bin/sh -c "node ace migration:run --force && node ace serve --watch" + command: /bin/sh -c "node ace migration:run --force || node ace serve --watch" depends_on: db: condition: service_healthy diff --git a/start/env.ts b/start/env.ts index 802d9bc..6982d2a 100644 --- a/start/env.ts +++ b/start/env.ts @@ -34,7 +34,7 @@ export default await Env.create(new URL('../', import.meta.url), { PG_USER: Env.schema.string(), PG_PASSWORD: Env.schema.string(), - WEBHOOK_URL: Env.schema.string(), + WEBHOOK_URL: Env.schema.string.optional(), QUERY_FILTER: Env.schema.string(), })