Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1814 from Dokploy/1690-remove-unused-networks-when-removing-projects-or-apps

Browse Source 
Enhance compose removal process by adding network disconnection command
This commit is contained in:
Mauricio Siu
2025-05-04 16:50:27 -06:00
committed by GitHub
parent 1eda6513df eb5ba2f219
commit c13a68dab4
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/server/src/services/compose.ts
View File

@@ -478,7 +478,9 @@ export const removeCompose = async (
const projectPath = join(COMPOSE_PATH, compose.appName); const projectPath = join(COMPOSE_PATH, compose.appName);
if (compose.composeType === "stack") { if (compose.composeType === "stack") {
const command = `cd ${projectPath} && docker stack rm ${compose.appName} && rm -rf ${projectPath}`; const command = `
docker network disconnect ${compose.appName} dokploy-traefik;
cd ${projectPath} && docker stack rm ${compose.appName} && rm -rf ${projectPath}`;
if (compose.serverId) { if (compose.serverId) {
await execAsyncRemote(compose.serverId, command); await execAsyncRemote(compose.serverId, command);
@@ -489,12 +491,11 @@ export const removeCompose = async (
cwd: projectPath, cwd: projectPath,
}); });
} else { } else {
let command: string; const command = `
if (deleteVolumes) { docker network disconnect ${compose.appName} dokploy-traefik;
command = `cd ${projectPath} && docker compose -p ${compose.appName} down --volumes && rm -rf ${projectPath}`; cd ${projectPath} && docker compose -p ${compose.appName} down ${
} else { deleteVolumes ? "--volumes" : ""
command = `cd ${projectPath} && docker compose -p ${compose.appName} down && rm -rf ${projectPath}`; } && rm -rf ${projectPath}`;
}
if (compose.serverId) { if (compose.serverId) {
await execAsyncRemote(compose.serverId, command); await execAsyncRemote(compose.serverId, command);

2
packages/server/src/services/settings.ts
View File

@@ -40,8 +40,6 @@ export const getServiceImageDigest = async () => {
"docker service inspect dokploy --format '{{.Spec.TaskTemplate.ContainerSpec.Image}}'", "docker service inspect dokploy --format '{{.Spec.TaskTemplate.ContainerSpec.Image}}'",
); );
console.log("stdout", stdout);
const currentDigest = stdout.trim().split("@")[1]; const currentDigest = stdout.trim().split("@")[1];
if (!currentDigest) { if (!currentDigest) {