From 472024126dd5ff37ce94d48b315600f05c76a907 Mon Sep 17 00:00:00 2001 From: AlexIves16 Date: Sun, 26 Apr 2026 16:36:44 +0500 Subject: [PATCH] fix: remove dotenv from prisma.config.ts for server compat --- .gitea/workflows/deploy.yml | 3 ++- prisma.config.ts | 3 --- server/docker-compose.yml | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index e221642..a491d1d 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -49,7 +49,8 @@ jobs: cp package.json /opt/xflow/package.json cp prisma.config.ts /opt/xflow/prisma.config.ts cp server/docker-compose.yml /opt/xflow/docker-compose.yml - docker-compose -f /opt/xflow/docker-compose.yml up -d --no-deps --force-recreate xflow + sed -i 's/infra-network/infra/' /opt/xflow/docker-compose.yml + docker compose -f /opt/xflow/docker-compose.yml up -d --no-deps --force-recreate xflow echo "⏳ Waiting for container to start..." sleep 5 docker exec xflow sh -c "cd /app && export DATABASE_URL=postgresql://xflow:xflow_pass@postgres:5432/xflow && npx prisma migrate deploy --config prisma.config.ts" diff --git a/prisma.config.ts b/prisma.config.ts index 831a20f..f96141d 100644 --- a/prisma.config.ts +++ b/prisma.config.ts @@ -1,6 +1,3 @@ -// This file was generated by Prisma, and assumes you have installed the following: -// npm install --save-dev prisma dotenv -import "dotenv/config"; import { defineConfig } from "prisma/config"; export default defineConfig({ diff --git a/server/docker-compose.yml b/server/docker-compose.yml index 71de7a4..a33ea96 100644 --- a/server/docker-compose.yml +++ b/server/docker-compose.yml @@ -64,9 +64,9 @@ services: working_dir: /app command: node .output/server/index.mjs networks: - - infra-network + - infra ports: - - "3000:3000" + - "3002:3000" environment: NODE_ENV: production PORT: 3000 @@ -87,8 +87,8 @@ services: - /opt/xflow/prisma:/app/prisma:ro - /opt/xflow/prisma.config.ts:/app/prisma.config.ts:ro networks: - infra-network: - driver: bridge + infra: + external: true volumes: postgres-data: