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

refactor: streamline container parsing logic in Docker service functions

Browse Source
This commit is contained in:
Mauricio Siu
2025-03-15 20:43:22 -06:00
parent 31164c9798
commit 8d9d00d0c6
1 changed files with 76 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
packages/server/src/services/docker.ts
View File

@@ -136,26 +136,24 @@ export const getContainersByAppNameMatch = async (
result = stdout.trim().split("\n"); result = stdout.trim().split("\n");
} }
const containers = result const containers = result.map((line) => {
.map((line) => { const parts = line.split(" | ");
const parts = line.split(" | "); const containerId = parts[0]
const containerId = parts[0] ? parts[0].replace("CONTAINER ID : ", "").trim()
? parts[0].replace("CONTAINER ID : ", "").trim() : "No container id";
: "No container id"; const name = parts[1]
const name = parts[1] ? parts[1].replace("Name: ", "").trim()
? parts[1].replace("Name: ", "").trim() : "No container name";
: "No container name";
const state = parts[2] const state = parts[2]
? parts[2].replace("State: ", "").trim() ? parts[2].replace("State: ", "").trim()
: "No state"; : "No state";
return { return {
containerId, containerId,
name, name,
state, state,
}; };
}) });
.sort((a, b) => a.name.localeCompare(b.name));
return containers || []; return containers || [];
} catch (_error) {} } catch (_error) {}
@@ -192,30 +190,28 @@ export const getStackContainersByAppName = async (
result = stdout.trim().split("\n"); result = stdout.trim().split("\n");
} }
const containers = result const containers = result.map((line) => {
.map((line) => { const parts = line.split(" | ");
const parts = line.split(" | "); const containerId = parts[0]
const containerId = parts[0] ? parts[0].replace("CONTAINER ID : ", "").trim()
? parts[0].replace("CONTAINER ID : ", "").trim() : "No container id";
: "No container id"; const name = parts[1]
const name = parts[1] ? parts[1].replace("Name: ", "").trim()
? parts[1].replace("Name: ", "").trim() : "No container name";
: "No container name";
const state = parts[2] const state = parts[2]
? parts[2].replace("State: ", "").trim().toLowerCase() ? parts[2].replace("State: ", "").trim().toLowerCase()
: "No state"; : "No state";
const node = parts[3] const node = parts[3]
? parts[3].replace("Node: ", "").trim() ? parts[3].replace("Node: ", "").trim()
: "No specific node"; : "No specific node";
return { return {
containerId, containerId,
name, name,
state, state,
node, node,
}; };
}) });
.sort((a, b) => a.name.localeCompare(b.name));
return containers || []; return containers || [];
} catch (_error) {} } catch (_error) {}
@@ -253,31 +249,29 @@ export const getServiceContainersByAppName = async (
result = stdout.trim().split("\n"); result = stdout.trim().split("\n");
} }
const containers = result const containers = result.map((line) => {
.map((line) => { const parts = line.split(" | ");
const parts = line.split(" | "); const containerId = parts[0]
const containerId = parts[0] ? parts[0].replace("CONTAINER ID : ", "").trim()
? parts[0].replace("CONTAINER ID : ", "").trim() : "No container id";
: "No container id"; const name = parts[1]
const name = parts[1] ? parts[1].replace("Name: ", "").trim()
? parts[1].replace("Name: ", "").trim() : "No container name";
: "No container name";
const state = parts[2] const state = parts[2]
? parts[2].replace("State: ", "").trim().toLowerCase() ? parts[2].replace("State: ", "").trim().toLowerCase()
: "No state"; : "No state";
const node = parts[3] const node = parts[3]
? parts[3].replace("Node: ", "").trim() ? parts[3].replace("Node: ", "").trim()
: "No specific node"; : "No specific node";
return { return {
containerId, containerId,
name, name,
state, state,
node, node,
}; };
}) });
.sort((a, b) => a.name.localeCompare(b.name));
return containers || []; return containers || [];
} catch (_error) {} } catch (_error) {}
@@ -318,25 +312,23 @@ export const getContainersByAppLabel = async (
const lines = stdout.trim().split("\n"); const lines = stdout.trim().split("\n");
const containers = lines const containers = lines.map((line) => {
.map((line) => { const parts = line.split(" | ");
const parts = line.split(" | "); const containerId = parts[0]
const containerId = parts[0] ? parts[0].replace("CONTAINER ID : ", "").trim()
? parts[0].replace("CONTAINER ID : ", "").trim() : "No container id";
: "No container id"; const name = parts[1]
const name = parts[1] ? parts[1].replace("Name: ", "").trim()
? parts[1].replace("Name: ", "").trim() : "No container name";
: "No container name"; const state = parts[2]
const state = parts[2] ? parts[2].replace("State: ", "").trim()
? parts[2].replace("State: ", "").trim() : "No state";
: "No state"; return {
return { containerId,
containerId, name,
name, state,
state, };
}; });
})
.sort((a, b) => a.name.localeCompare(b.name));
return containers || []; return containers || [];
} catch (_error) {} } catch (_error) {}