diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json index c095d1be4..028ad20d7 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -1,6 +1,6 @@ { "name": "dokploy", - "version": "v0.21.1", + "version": "v0.21.2", "private": true, "license": "Apache-2.0", "type": "module", diff --git a/apps/dokploy/server/server.ts b/apps/dokploy/server/server.ts index d10298cd5..8ec533ffa 100644 --- a/apps/dokploy/server/server.ts +++ b/apps/dokploy/server/server.ts @@ -46,8 +46,8 @@ void app.prepare().then(async () => { await initializeNetwork(); createDefaultTraefikConfig(); createDefaultServerTraefikConfig(); - await initCronJobs(); await migration(); + await initCronJobs(); await sendDokployRestartNotifications(); } diff --git a/packages/server/src/utils/backups/index.ts b/packages/server/src/utils/backups/index.ts index d412df90d..b83d8279b 100644 --- a/packages/server/src/utils/backups/index.ts +++ b/packages/server/src/utils/backups/index.ts @@ -2,7 +2,6 @@ import path from "node:path"; import { getAllServers } from "@dokploy/server/services/server"; import { scheduleJob } from "node-schedule"; import { db } from "../../db/index"; -import { findAdmin } from "../../services/admin"; import { cleanUpDockerBuilder, cleanUpSystemPrune, @@ -14,13 +13,24 @@ import { getS3Credentials, scheduleBackup } from "./utils"; import type { BackupSchedule } from "@dokploy/server/services/backup"; import { startLogCleanup } from "../access-log/handler"; +import { member } from "@dokploy/server/db/schema"; +import { eq } from "drizzle-orm"; export const initCronJobs = async () => { console.log("Setting up cron jobs...."); - const admin = await findAdmin(); + const admin = await db.query.member.findFirst({ + where: eq(member.role, "owner"), + with: { + user: true, + }, + }); - if (admin?.user.enableDockerCleanup) { + if (!admin) { + return; + } + + if (admin.user.enableDockerCleanup) { scheduleJob("docker-cleanup", "0 0 * * *", async () => { console.log( `Docker Cleanup ${new Date().toLocaleString()}] Running docker cleanup`,