fix: renames

This commit is contained in:
fir4tozden
2025-12-01 01:07:33 +03:00
parent fbd095334c
commit f1ef1d8489
2 changed files with 21 additions and 22 deletions
+19 -21
View File
@@ -1,11 +1,12 @@
import { import {
canAccessToTraefikFiles, canAccessToTraefikFiles,
checkGPUStatus, checkGPUStatus,
cleanStoppedContainers, cleanupContainers,
cleanUpDockerBuilder, cleanupBuilders,
cleanUpSystemPrune, cleanupSystem,
cleanUpUnusedImages, cleanupImages,
cleanUpUnusedVolumes, cleanupVolumes,
cleanupAll,
DEFAULT_UPDATE_DATA, DEFAULT_UPDATE_DATA,
execAsync, execAsync,
findServerById, findServerById,
@@ -149,41 +150,38 @@ export const settingsRouter = createTRPCRouter({
cleanUnusedImages: adminProcedure cleanUnusedImages: adminProcedure
.input(apiServerSchema) .input(apiServerSchema)
.mutation(async ({ input }) => { .mutation(async ({ input }) => {
await cleanUpUnusedImages(input?.serverId); await cleanupImages(input?.serverId);
return true; return true;
}), }),
cleanUnusedVolumes: adminProcedure cleanUnusedVolumes: adminProcedure
.input(apiServerSchema) .input(apiServerSchema)
.mutation(async ({ input }) => { .mutation(async ({ input }) => {
await cleanUpUnusedVolumes(input?.serverId); await cleanupVolumes(input?.serverId);
return true; return true;
}), }),
cleanStoppedContainers: adminProcedure cleanStoppedContainers: adminProcedure
.input(apiServerSchema) .input(apiServerSchema)
.mutation(async ({ input }) => { .mutation(async ({ input }) => {
await cleanStoppedContainers(input?.serverId); await cleanupContainers(input?.serverId);
return true; return true;
}), }),
cleanDockerBuilder: adminProcedure cleanDockerBuilder: adminProcedure
.input(apiServerSchema) .input(apiServerSchema)
.mutation(async ({ input }) => { .mutation(async ({ input }) => {
await cleanUpDockerBuilder(input?.serverId); await cleanupBuilders(input?.serverId);
}), }),
cleanDockerPrune: adminProcedure cleanDockerPrune: adminProcedure
.input(apiServerSchema) .input(apiServerSchema)
.mutation(async ({ input }) => { .mutation(async ({ input }) => {
await cleanUpSystemPrune(input?.serverId); await cleanupSystem(input?.serverId);
await cleanUpDockerBuilder(input?.serverId); await cleanupBuilders(input?.serverId);
return true; return true;
}), }),
cleanAll: adminProcedure cleanAll: adminProcedure
.input(apiServerSchema) .input(apiServerSchema)
.mutation(async ({ input }) => { .mutation(async ({ input }) => {
await cleanUpUnusedImages(input?.serverId); await cleanupAll(input?.serverId);
await cleanStoppedContainers(input?.serverId);
await cleanUpDockerBuilder(input?.serverId);
await cleanUpSystemPrune(input?.serverId);
return true; return true;
}), }),
@@ -281,9 +279,9 @@ export const settingsRouter = createTRPCRouter({
console.log( console.log(
`Docker Cleanup ${new Date().toLocaleString()}] Running...`, `Docker Cleanup ${new Date().toLocaleString()}] Running...`,
); );
await cleanUpUnusedImages(server.serverId);
await cleanUpDockerBuilder(server.serverId); await cleanupAll();
await cleanUpSystemPrune(server.serverId);
await sendDockerCleanupNotifications(server.organizationId); await sendDockerCleanupNotifications(server.organizationId);
}); });
} }
@@ -309,9 +307,9 @@ export const settingsRouter = createTRPCRouter({
console.log( console.log(
`Docker Cleanup ${new Date().toLocaleString()}] Running...`, `Docker Cleanup ${new Date().toLocaleString()}] Running...`,
); );
await cleanUpUnusedImages();
await cleanUpDockerBuilder(); await cleanupAll();
await cleanUpSystemPrune();
await sendDockerCleanupNotifications( await sendDockerCleanupNotifications(
ctx.session.activeOrganizationId, ctx.session.activeOrganizationId,
); );
+2 -1
View File
@@ -259,7 +259,8 @@ export const cleanupAll = async (serverId?: string) => {
await cleanupVolumes(serverId); await cleanupVolumes(serverId);
await cleanupBuilders(serverId); await cleanupBuilders(serverId);
await cleanupSystem(serverId); await cleanupSystem(serverId);
await cleanupInactiveContainers();
// await cleanupInactiveContainers(); <-- This wasn't being used. If it's ready, it should be used here. - https://github.com/fir4tozden
}; };
export const startService = async (appName: string) => { export const startService = async (appName: string) => {