diff --git a/apps/dokploy/migration.ts b/apps/dokploy/migration.ts index dd312b805..984197b2a 100644 --- a/apps/dokploy/migration.ts +++ b/apps/dokploy/migration.ts @@ -1,11 +1,9 @@ +import { dbUrl } from "@dokploy/server/db"; import { drizzle } from "drizzle-orm/postgres-js"; import { migrate } from "drizzle-orm/postgres-js/migrator"; import postgres from "postgres"; -import { dbUrl } from "./server/db"; -const connectionString = dbUrl; - -const sql = postgres(connectionString, { max: 1 }); +const sql = postgres(dbUrl, { max: 1 }); const db = drizzle(sql); await migrate(db, { migrationsFolder: "drizzle" }) diff --git a/apps/dokploy/server/db/drizzle.config.ts b/apps/dokploy/server/db/drizzle.config.ts index 60a3bb937..8f6a4a60a 100644 --- a/apps/dokploy/server/db/drizzle.config.ts +++ b/apps/dokploy/server/db/drizzle.config.ts @@ -1,10 +1,11 @@ +import { dbUrl } from "@dokploy/server/db"; import { defineConfig } from "drizzle-kit"; export default defineConfig({ schema: "./server/db/schema/index.ts", dialect: "postgresql", dbCredentials: { - url: process.env.DATABASE_URL!, + url: dbUrl, }, out: "drizzle", migrations: { diff --git a/apps/dokploy/server/db/index.ts b/apps/dokploy/server/db/index.ts index 618ff772a..2112c4f67 100644 --- a/apps/dokploy/server/db/index.ts +++ b/apps/dokploy/server/db/index.ts @@ -1,4 +1,4 @@ -import fs from "node:fs"; +import { dbUrl } from "@dokploy/server/db/constants"; import { drizzle, type PostgresJsDatabase } from "drizzle-orm/postgres-js"; import postgres from "postgres"; import * as schema from "./schema"; @@ -7,46 +7,6 @@ declare global { var db: PostgresJsDatabase | undefined; } -function readSecret(path: string): string { - try { - return fs.readFileSync(path, "utf8").trim(); - } catch { - throw new Error(`Cannot read secret at ${path}`); - } -} - -const { - DATABASE_URL, - POSTGRES_PASSWORD_FILE, - POSTGRES_USER = "dokploy", - POSTGRES_DB = "dokploy", - POSTGRES_HOST = "dokploy-postgres", - POSTGRES_PORT = "5432", -} = process.env; - -export let dbUrl: string; - -if (DATABASE_URL) { - // Compatibilidad legacy / overrides - dbUrl = DATABASE_URL; -} else if (POSTGRES_PASSWORD_FILE) { - const password = readSecret(POSTGRES_PASSWORD_FILE); - dbUrl = `postgres://${POSTGRES_USER}:${encodeURIComponent( - password, - )}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}`; -} else { - console.warn(` - ⚠️ [DEPRECATED DATABASE CONFIG] - You are using the legacy hardcoded database credentials. - This mode WILL BE REMOVED in a future release. - - Please migrate to Docker Secrets using POSTGRES_PASSWORD_FILE. - Please execute this guide: https://dokploy.com/SECURITY_MIGRATION.md - `); - dbUrl = - "postgres://dokploy:amukds4wi9001583845717ad2@dokploy-postgres:5432/dokploy"; -} - export let db: PostgresJsDatabase; if (process.env.NODE_ENV === "production") { db = drizzle(postgres(dbUrl!), { diff --git a/apps/dokploy/server/db/migration.ts b/apps/dokploy/server/db/migration.ts deleted file mode 100644 index fa2e1a80f..000000000 --- a/apps/dokploy/server/db/migration.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { drizzle } from "drizzle-orm/postgres-js"; -import { migrate } from "drizzle-orm/postgres-js/migrator"; -import postgres from "postgres"; - -const connectionString = process.env.DATABASE_URL!; - -const sql = postgres(connectionString, { max: 1 }); -const db = drizzle(sql); - -export const migration = async () => - await migrate(db, { migrationsFolder: "drizzle" }) - .then(() => { - console.log("Migration complete"); - sql.end(); - }) - .catch((error) => { - console.log("Migration failed", error); - }) - .finally(() => { - sql.end(); - }); diff --git a/apps/dokploy/server/db/reset.ts b/apps/dokploy/server/db/reset.ts index c22291478..4c6e3736e 100644 --- a/apps/dokploy/server/db/reset.ts +++ b/apps/dokploy/server/db/reset.ts @@ -1,11 +1,10 @@ +import { dbUrl } from "@dokploy/server/db"; import { sql } from "drizzle-orm"; // Credits to Louistiti from Drizzle Discord: https://discord.com/channels/1043890932593987624/1130802621750448160/1143083373535973406 import { drizzle } from "drizzle-orm/postgres-js"; import postgres from "postgres"; -const connectionString = process.env.DATABASE_URL!; - -const pg = postgres(connectionString, { max: 1 }); +const pg = postgres(dbUrl, { max: 1 }); const db = drizzle(pg); const clearDb = async (): Promise => { diff --git a/packages/server/src/db/constants.ts b/packages/server/src/db/constants.ts new file mode 100644 index 000000000..862288100 --- /dev/null +++ b/packages/server/src/db/constants.ts @@ -0,0 +1,39 @@ +import fs from "node:fs"; + +export const { + DATABASE_URL, + POSTGRES_PASSWORD_FILE, + POSTGRES_USER = "dokploy", + POSTGRES_DB = "dokploy", + POSTGRES_HOST = "dokploy-postgres", + POSTGRES_PORT = "5432", +} = process.env; + +function readSecret(path: string): string { + try { + return fs.readFileSync(path, "utf8").trim(); + } catch { + throw new Error(`Cannot read secret at ${path}`); + } +} +export let dbUrl: string; +if (DATABASE_URL) { + // Compatibilidad legacy / overrides + dbUrl = DATABASE_URL; +} else if (POSTGRES_PASSWORD_FILE) { + const password = readSecret(POSTGRES_PASSWORD_FILE); + dbUrl = `postgres://${POSTGRES_USER}:${encodeURIComponent( + password, + )}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}`; +} else { + console.warn(` + ⚠️ [DEPRECATED DATABASE CONFIG] + You are using the legacy hardcoded database credentials. + This mode WILL BE REMOVED in a future release. + + Please migrate to Docker Secrets using POSTGRES_PASSWORD_FILE. + Please execute this guide: https://dokploy.com/SECURITY_MIGRATION.md + `); + dbUrl = + "postgres://dokploy:amukds4wi9001583845717ad2@dokploy-postgres:5432/dokploy"; +} diff --git a/packages/server/src/db/index.ts b/packages/server/src/db/index.ts index 3ac6e3940..e17002de9 100644 --- a/packages/server/src/db/index.ts +++ b/packages/server/src/db/index.ts @@ -1,5 +1,6 @@ import { drizzle, type PostgresJsDatabase } from "drizzle-orm/postgres-js"; import postgres from "postgres"; +import { dbUrl } from "./constants"; import * as schema from "./schema"; declare global { @@ -8,14 +9,16 @@ declare global { export let db: PostgresJsDatabase; if (process.env.NODE_ENV === "production") { - db = drizzle(postgres(process.env.DATABASE_URL!), { + db = drizzle(postgres(dbUrl), { schema, }); } else { if (!global.db) - global.db = drizzle(postgres(process.env.DATABASE_URL!), { + global.db = drizzle(postgres(dbUrl), { schema, }); db = global.db; } + +export { dbUrl }; diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index f28711dbf..c05ac1ab7 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -1,5 +1,6 @@ export * from "./auth/random-password"; export * from "./constants/index"; +export * from "./db/constants"; export * from "./db/validations/domain"; export * from "./db/validations/index"; export * from "./lib/auth";