fix(prisma,db): add url to datasource in schema.prisma, copy prisma.config.ts to runner, and set POSTGRES_HOST_AUTH_METHOD=trust

This commit is contained in:
2026-09-28 11:25:06 +05:00
parent 9393cb823d
commit 54bfb8edd7
4 changed files with 8 additions and 4 deletions
+3 -1
View File
@@ -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
+1 -2
View File
@@ -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",
},
});
+1
View File
@@ -4,6 +4,7 @@ generator client {
datasource db {
provider = "postgresql"
url = env("DATABASE_URL")
}
model User {
+2
View File
@@ -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