mirror of
https://github.com/andwati/dokploy.git
synced 2026-11-16 00:45:18 +00:00
Merge pull request #3064 from fir4tozden/fix/docker-cleanup-clears-away-all-unused-residue
fix: docker cleanup clears away all unused residue
This commit is contained in:
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE "user" ALTER COLUMN "enableDockerCleanup" SET DEFAULT true;
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -883,6 +883,13 @@
|
|||||||
"when": 1764573207555,
|
"when": 1764573207555,
|
||||||
"tag": "0125_neat_the_phantom",
|
"tag": "0125_neat_the_phantom",
|
||||||
"breakpoints": true
|
"breakpoints": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idx": 126,
|
||||||
|
"version": "7",
|
||||||
|
"when": 1765065295708,
|
||||||
|
"tag": "0126_nifty_monster_badoon",
|
||||||
|
"breakpoints": true
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -1,12 +1,13 @@
|
|||||||
import {
|
import {
|
||||||
canAccessToTraefikFiles,
|
canAccessToTraefikFiles,
|
||||||
checkGPUStatus,
|
checkGPUStatus,
|
||||||
|
cleanupContainers,
|
||||||
|
cleanupBuilders,
|
||||||
|
cleanupSystem,
|
||||||
|
cleanupImages,
|
||||||
|
cleanupVolumes,
|
||||||
|
cleanupAll,
|
||||||
checkPortInUse,
|
checkPortInUse,
|
||||||
cleanStoppedContainers,
|
|
||||||
cleanUpDockerBuilder,
|
|
||||||
cleanUpSystemPrune,
|
|
||||||
cleanUpUnusedImages,
|
|
||||||
cleanUpUnusedVolumes,
|
|
||||||
DEFAULT_UPDATE_DATA,
|
DEFAULT_UPDATE_DATA,
|
||||||
execAsync,
|
execAsync,
|
||||||
findServerById,
|
findServerById,
|
||||||
@@ -161,41 +162,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;
|
||||||
}),
|
}),
|
||||||
@@ -293,9 +291,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(server.serverId);
|
||||||
await cleanUpSystemPrune(server.serverId);
|
|
||||||
await sendDockerCleanupNotifications(server.organizationId);
|
await sendDockerCleanupNotifications(server.organizationId);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -321,9 +319,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,
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
import {
|
import {
|
||||||
cleanUpDockerBuilder,
|
cleanupAll,
|
||||||
cleanUpSystemPrune,
|
|
||||||
cleanUpUnusedImages,
|
|
||||||
findBackupById,
|
findBackupById,
|
||||||
findScheduleById,
|
findScheduleById,
|
||||||
findServerById,
|
findServerById,
|
||||||
@@ -91,9 +89,7 @@ export const runJobs = async (job: QueueJob) => {
|
|||||||
logger.info("Server is inactive");
|
logger.info("Server is inactive");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
await cleanUpUnusedImages(serverId);
|
await cleanupAll(serverId);
|
||||||
await cleanUpDockerBuilder(serverId);
|
|
||||||
await cleanUpSystemPrune(serverId);
|
|
||||||
} else if (job.type === "schedule") {
|
} else if (job.type === "schedule") {
|
||||||
const { scheduleId } = job;
|
const { scheduleId } = job;
|
||||||
const schedule = await findScheduleById(scheduleId);
|
const schedule = await findScheduleById(scheduleId);
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ export const user = pgTable("user", {
|
|||||||
host: text("host"),
|
host: text("host"),
|
||||||
letsEncryptEmail: text("letsEncryptEmail"),
|
letsEncryptEmail: text("letsEncryptEmail"),
|
||||||
sshPrivateKey: text("sshPrivateKey"),
|
sshPrivateKey: text("sshPrivateKey"),
|
||||||
enableDockerCleanup: boolean("enableDockerCleanup").notNull().default(false),
|
enableDockerCleanup: boolean("enableDockerCleanup").notNull().default(true),
|
||||||
logCleanupCron: text("logCleanupCron").default("0 0 * * *"),
|
logCleanupCron: text("logCleanupCron").default("0 0 * * *"),
|
||||||
role: text("role").notNull().default("user"),
|
role: text("role").notNull().default("user"),
|
||||||
// Metrics
|
// Metrics
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { readdirSync } from "node:fs";
|
import { readdirSync } from "node:fs";
|
||||||
import { join } from "node:path";
|
import { join } from "node:path";
|
||||||
import { docker } from "@dokploy/server/constants";
|
import { docker } from "@dokploy/server/constants";
|
||||||
|
import { cleanupAll } from "@dokploy/server/utils/docker/utils";
|
||||||
import {
|
import {
|
||||||
execAsync,
|
execAsync,
|
||||||
execAsyncRemote,
|
execAsyncRemote,
|
||||||
@@ -215,38 +216,6 @@ echo "$json_output"
|
|||||||
return result;
|
return result;
|
||||||
};
|
};
|
||||||
|
|
||||||
export const cleanupFullDocker = async (serverId?: string | null) => {
|
|
||||||
const cleanupImages = "docker image prune --force";
|
|
||||||
const cleanupVolumes = "docker volume prune --force";
|
|
||||||
const cleanupContainers = "docker container prune --force";
|
|
||||||
const cleanupSystem = "docker system prune --force --volumes";
|
|
||||||
const cleanupBuilder = "docker builder prune --force";
|
|
||||||
|
|
||||||
try {
|
|
||||||
if (serverId) {
|
|
||||||
await execAsyncRemote(
|
|
||||||
serverId,
|
|
||||||
`
|
|
||||||
${cleanupImages}
|
|
||||||
${cleanupVolumes}
|
|
||||||
${cleanupContainers}
|
|
||||||
${cleanupSystem}
|
|
||||||
${cleanupBuilder}
|
|
||||||
`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
await execAsync(`
|
|
||||||
${cleanupImages}
|
|
||||||
${cleanupVolumes}
|
|
||||||
${cleanupContainers}
|
|
||||||
${cleanupSystem}
|
|
||||||
${cleanupBuilder}
|
|
||||||
`);
|
|
||||||
} catch (error) {
|
|
||||||
console.log(error);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
export const getDockerResourceType = async (
|
export const getDockerResourceType = async (
|
||||||
resourceName: string,
|
resourceName: string,
|
||||||
serverId?: string,
|
serverId?: string,
|
||||||
|
|||||||
@@ -6,11 +6,7 @@ import { eq } from "drizzle-orm";
|
|||||||
import { scheduleJob } from "node-schedule";
|
import { scheduleJob } from "node-schedule";
|
||||||
import { db } from "../../db/index";
|
import { db } from "../../db/index";
|
||||||
import { startLogCleanup } from "../access-log/handler";
|
import { startLogCleanup } from "../access-log/handler";
|
||||||
import {
|
import { cleanupAll } from "../docker/utils";
|
||||||
cleanUpDockerBuilder,
|
|
||||||
cleanUpSystemPrune,
|
|
||||||
cleanUpUnusedImages,
|
|
||||||
} from "../docker/utils";
|
|
||||||
import { sendDockerCleanupNotifications } from "../notifications/docker-cleanup";
|
import { sendDockerCleanupNotifications } from "../notifications/docker-cleanup";
|
||||||
import { execAsync, execAsyncRemote } from "../process/execAsync";
|
import { execAsync, execAsyncRemote } from "../process/execAsync";
|
||||||
import { getS3Credentials, scheduleBackup } from "./utils";
|
import { getS3Credentials, scheduleBackup } from "./utils";
|
||||||
@@ -34,9 +30,9 @@ export const initCronJobs = async () => {
|
|||||||
console.log(
|
console.log(
|
||||||
`Docker Cleanup ${new Date().toLocaleString()}] Running docker cleanup`,
|
`Docker Cleanup ${new Date().toLocaleString()}] Running docker cleanup`,
|
||||||
);
|
);
|
||||||
await cleanUpUnusedImages();
|
|
||||||
await cleanUpDockerBuilder();
|
await cleanupAll();
|
||||||
await cleanUpSystemPrune();
|
|
||||||
await sendDockerCleanupNotifications(admin.user.id);
|
await sendDockerCleanupNotifications(admin.user.id);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -50,9 +46,9 @@ export const initCronJobs = async () => {
|
|||||||
console.log(
|
console.log(
|
||||||
`SERVER-BACKUP[${new Date().toLocaleString()}] Running Cleanup ${name}`,
|
`SERVER-BACKUP[${new Date().toLocaleString()}] Running Cleanup ${name}`,
|
||||||
);
|
);
|
||||||
await cleanUpUnusedImages(serverId);
|
|
||||||
await cleanUpDockerBuilder(serverId);
|
await cleanupAll(serverId);
|
||||||
await cleanUpSystemPrune(serverId);
|
|
||||||
await sendDockerCleanupNotifications(
|
await sendDockerCleanupNotifications(
|
||||||
admin.user.id,
|
admin.user.id,
|
||||||
`Docker cleanup for Server ${name} (${serverId})`,
|
`Docker cleanup for Server ${name} (${serverId})`,
|
||||||
|
|||||||
@@ -144,81 +144,117 @@ export const getContainerByName = (name: string): Promise<ContainerInfo> => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
export const cleanUpUnusedImages = async (serverId?: string) => {
|
|
||||||
try {
|
|
||||||
const command = "docker image prune --force";
|
|
||||||
if (serverId) {
|
|
||||||
await execAsyncRemote(serverId, command);
|
|
||||||
} else {
|
|
||||||
await execAsync(command);
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error(error);
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
export const cleanStoppedContainers = async (serverId?: string) => {
|
/**
|
||||||
|
* Docker commands passed through this method are held during Docker's build or pull process.
|
||||||
|
*
|
||||||
|
* https://github.com/Dokploy/dokploy/pull/3064
|
||||||
|
* https://github.com/fir4tozden
|
||||||
|
*/
|
||||||
|
export const dockerSafeExec = (exec: string) => `CHECK_INTERVAL=10
|
||||||
|
|
||||||
|
echo "Preparing for execution..."
|
||||||
|
|
||||||
|
while true; do
|
||||||
|
PROCESSES=$(ps aux | grep -E "docker build|docker pull" | grep -v grep)
|
||||||
|
|
||||||
|
if [ -z "$PROCESSES" ]; then
|
||||||
|
echo "Docker is idle. Starting execution..."
|
||||||
|
break
|
||||||
|
else
|
||||||
|
echo "Docker is busy. Will check again in $CHECK_INTERVAL seconds..."
|
||||||
|
sleep $CHECK_INTERVAL
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
${exec}
|
||||||
|
|
||||||
|
echo "Execution completed."`;
|
||||||
|
|
||||||
|
export const cleanupContainers = async (serverId?: string) => {
|
||||||
try {
|
try {
|
||||||
const command = "docker container prune --force";
|
const command = "docker container prune --force";
|
||||||
|
|
||||||
if (serverId) {
|
if (serverId) {
|
||||||
await execAsyncRemote(serverId, command);
|
await execAsyncRemote(serverId, dockerSafeExec(command));
|
||||||
} else {
|
} else {
|
||||||
await execAsync(command);
|
await execAsync(dockerSafeExec(command));
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
|
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export const cleanUpUnusedVolumes = async (serverId?: string) => {
|
export const cleanupImages = async (serverId?: string) => {
|
||||||
try {
|
try {
|
||||||
const command = "docker volume prune --force";
|
const command = "docker image prune --all --force";
|
||||||
|
|
||||||
if (serverId) {
|
if (serverId) {
|
||||||
await execAsyncRemote(serverId, command);
|
await execAsyncRemote(serverId, dockerSafeExec(command));
|
||||||
|
} else await execAsync(dockerSafeExec(command));
|
||||||
|
} catch (error) {
|
||||||
|
console.error(error);
|
||||||
|
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const cleanupVolumes = async (serverId?: string) => {
|
||||||
|
try {
|
||||||
|
const command = "docker volume prune --all --force";
|
||||||
|
|
||||||
|
if (serverId) {
|
||||||
|
await execAsyncRemote(serverId, dockerSafeExec(command));
|
||||||
} else {
|
} else {
|
||||||
await execAsync(command);
|
await execAsync(dockerSafeExec(command));
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
|
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export const cleanUpInactiveContainers = async () => {
|
export const cleanupBuilders = async (serverId?: string) => {
|
||||||
try {
|
try {
|
||||||
const containers = await docker.listContainers({ all: true });
|
const command = "docker builder prune --all --force";
|
||||||
const inactiveContainers = containers.filter(
|
|
||||||
(container) => container.State !== "running",
|
|
||||||
);
|
|
||||||
|
|
||||||
for (const container of inactiveContainers) {
|
if (serverId) {
|
||||||
await docker.getContainer(container.Id).remove({ force: true });
|
await execAsyncRemote(serverId, dockerSafeExec(command));
|
||||||
console.log(`Cleaning up inactive container: ${container.Id}`);
|
} else {
|
||||||
|
await execAsync(dockerSafeExec(command));
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error cleaning up inactive containers:", error);
|
console.error(error);
|
||||||
|
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export const cleanUpDockerBuilder = async (serverId?: string) => {
|
export const cleanupSystem = async (serverId?: string) => {
|
||||||
const command = "docker builder prune --all --force";
|
try {
|
||||||
if (serverId) {
|
const command = "docker system prune --all --volumes --force";
|
||||||
await execAsyncRemote(serverId, command);
|
|
||||||
} else {
|
if (serverId) {
|
||||||
await execAsync(command);
|
await execAsyncRemote(serverId, dockerSafeExec(command));
|
||||||
|
} else {
|
||||||
|
await execAsync(dockerSafeExec(command));
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error(error);
|
||||||
|
|
||||||
|
throw error;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export const cleanUpSystemPrune = async (serverId?: string) => {
|
export const cleanupAll = async (serverId?: string) => {
|
||||||
const command = "docker system prune --force --volumes";
|
await cleanupContainers(serverId);
|
||||||
if (serverId) {
|
await cleanupImages(serverId);
|
||||||
await execAsyncRemote(serverId, command);
|
await cleanupVolumes(serverId);
|
||||||
} else {
|
await cleanupBuilders(serverId);
|
||||||
await execAsync(command);
|
await cleanupSystem(serverId);
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export const startService = async (appName: string) => {
|
export const startService = async (appName: string) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user