diff --git a/packages/server/src/services/settings.ts b/packages/server/src/services/settings.ts index 748eb769f..19639c439 100644 --- a/packages/server/src/services/settings.ts +++ b/packages/server/src/services/settings.ts @@ -216,7 +216,8 @@ echo "$json_output" return result; }; -export const cleanupFullDocker = async (serverId?: string) => cleanupAll(serverId); +export const cleanupFullDocker = async (serverId?: string) => + cleanupAll(serverId); export const getDockerResourceType = async ( resourceName: string, diff --git a/packages/server/src/utils/backups/index.ts b/packages/server/src/utils/backups/index.ts index d1481c345..249610a25 100644 --- a/packages/server/src/utils/backups/index.ts +++ b/packages/server/src/utils/backups/index.ts @@ -6,9 +6,7 @@ import { eq } from "drizzle-orm"; import { scheduleJob } from "node-schedule"; import { db } from "../../db/index"; import { startLogCleanup } from "../access-log/handler"; -import { - cleanupAll -} from "../docker/utils"; +import { cleanupAll } from "../docker/utils"; import { sendDockerCleanupNotifications } from "../notifications/docker-cleanup"; import { execAsync, execAsyncRemote } from "../process/execAsync"; import { getS3Credentials, scheduleBackup } from "./utils"; @@ -47,7 +45,7 @@ export const initCronJobs = async () => { scheduleJob(serverId, "0 0 * * *", async () => { console.log( `SERVER-BACKUP[${new Date().toLocaleString()}] Running Cleanup ${name}`, - ) + ); await cleanupImages(serverId); diff --git a/packages/server/src/utils/docker/utils.ts b/packages/server/src/utils/docker/utils.ts index a779e0b6d..0195cce7f 100644 --- a/packages/server/src/utils/docker/utils.ts +++ b/packages/server/src/utils/docker/utils.ts @@ -169,7 +169,7 @@ echo "Execution completed."`; export const cleanupContainers = async (serverId?: string) => { try { const command = "docker container prune --force"; - + if (serverId) { await execAsyncRemote(serverId, dockerSafeExec(command)); } else await execAsync(dockerSafeExec(command)); @@ -183,7 +183,7 @@ export const cleanupContainers = async (serverId?: string) => { export const cleanupImages = async (serverId?: string) => { try { const command = "docker image prune --all --force"; - + if (serverId) { await execAsyncRemote(serverId, dockerSafeExec(command)); } else await execAsync(dockerSafeExec(command)); @@ -197,7 +197,7 @@ export const cleanupImages = async (serverId?: string) => { export const cleanupVolumes = async (serverId?: string) => { try { const command = "docker volume prune --all --force"; - + if (serverId) { await execAsyncRemote(serverId, dockerSafeExec(command)); } else await execAsync(dockerSafeExec(command)); @@ -211,7 +211,7 @@ export const cleanupVolumes = async (serverId?: string) => { export const cleanupBuilders = async (serverId?: string) => { try { const command = "docker builder prune --all --force"; - + if (serverId) { await execAsyncRemote(serverId, dockerSafeExec(command)); } else await execAsync(dockerSafeExec(command)); @@ -225,7 +225,7 @@ export const cleanupBuilders = async (serverId?: string) => { export const cleanupSystem = async (serverId?: string) => { try { const command = "docker system prune --all --volumes --force"; - + if (serverId) { await execAsyncRemote(serverId, dockerSafeExec(command)); } else await execAsync(dockerSafeExec(command)); @@ -260,7 +260,7 @@ export const cleanupAll = async (serverId?: string) => { await cleanupBuilders(serverId); await cleanupSystem(serverId); await cleanupInactiveContainers(); -} +}; export const startService = async (appName: string) => { try {