From 54bfb8edd77bd0b9100642dbca6fc4184a0747e3 Mon Sep 17 00:00:00 2001 From: Alexyz Date: Mon, 28 Sep 2026 11:25:06 +0500 Subject: [PATCH] fix(prisma,db): add url to datasource in schema.prisma, copy prisma.config.ts to runner, and set POSTGRES_HOST_AUTH_METHOD=trust --- Dockerfile.coolify | 6 ++++-- apps/web/prisma.config.ts | 3 +-- apps/web/prisma/schema.prisma | 1 + docker-compose.coolify.yml | 2 ++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile.coolify b/Dockerfile.coolify index 621d03f..5aab2b7 100644 --- a/Dockerfile.coolify +++ b/Dockerfile.coolify @@ -59,9 +59,10 @@ ENV SITE_URL=${SITE_URL} \ NUXT_PUBLIC_FIREBASE_APP_ID=${FIREBASE_APP_ID} \ TZ=${TZ} -# Копируем package.json и prisma схемы из apps/web +# Копируем package.json, prisma схемы и конфиг COPY apps/web/package*.json ./ COPY apps/web/prisma ./prisma +COPY apps/web/prisma.config.ts ./ RUN npm ci --include=optional && npx prisma generate # Копируем исходный код apps/web @@ -98,6 +99,7 @@ ENV SITE_URL=${SITE_URL} \ COPY --from=builder /src/.output ./.output COPY --from=builder /src/prisma ./prisma +COPY --from=builder /src/prisma.config.ts ./ COPY --from=builder /src/package.json ./ COPY --from=builder /src/node_modules ./node_modules @@ -110,4 +112,4 @@ ENV NITRO_PORT=3000 EXPOSE 3000 -CMD ["sh", "-c", "npx prisma db push --accept-data-loss && exec node .output/server/index.mjs"] +CMD ["sh", "-c", "npx prisma db push --accept-data-loss && exec node .output/server/index.mjs"] diff --git a/apps/web/prisma.config.ts b/apps/web/prisma.config.ts index 1c6ce5c..47832f1 100644 --- a/apps/web/prisma.config.ts +++ b/apps/web/prisma.config.ts @@ -1,12 +1,11 @@ import { defineConfig } from "prisma/config"; -// Призма 7 иногда требует явной загрузки .env для некоторых команд export default defineConfig({ schema: "prisma/schema.prisma", migrations: { path: "prisma/migrations", }, datasource: { - url: process.env.DATABASE_URL || "postgresql://admin:secure_master_pass@localhost:5432/xflow_crm_db", + url: process.env.DATABASE_URL || "postgresql://xflow:xflow@db:5432/xflow", }, }); diff --git a/apps/web/prisma/schema.prisma b/apps/web/prisma/schema.prisma index 6c70ca8..cbabec6 100644 --- a/apps/web/prisma/schema.prisma +++ b/apps/web/prisma/schema.prisma @@ -4,6 +4,7 @@ generator client { datasource db { provider = "postgresql" + url = env("DATABASE_URL") } model User { diff --git a/docker-compose.coolify.yml b/docker-compose.coolify.yml index 0c91341..67cc333 100644 --- a/docker-compose.coolify.yml +++ b/docker-compose.coolify.yml @@ -49,6 +49,7 @@ services: POSTGRES_USER: '${POSTGRES_USER:-xflow}' POSTGRES_DB: '${POSTGRES_DB:-xflow}' + POSTGRES_HOST_AUTH_METHOD: 'trust' POSTGRES_PASSWORD: '${POSTGRES_PASSWORD:-xflow_db_secret_pass}' DATABASE_URL: '${DATABASE_URL:-postgresql://xflow:${POSTGRES_PASSWORD:-xflow_db_secret_pass}@db:5432/xflow}' NUXT_DATABASE_URL: '${DATABASE_URL:-postgresql://xflow:${POSTGRES_PASSWORD:-xflow_db_secret_pass}@db:5432/xflow}' @@ -90,6 +91,7 @@ services: POSTGRES_USER: '${POSTGRES_USER:-xflow}' POSTGRES_PASSWORD: '${POSTGRES_PASSWORD:-xflow_db_secret_pass}' POSTGRES_DB: '${POSTGRES_DB:-xflow}' + POSTGRES_HOST_AUTH_METHOD: 'trust' volumes: - xflow-pg-data:/var/lib/postgresql/data