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(bundler): removed redundant code

Browse Source
This commit is contained in:
xenonwellz
2024-11-03 15:26:54 +01:00
parent 9c355bcfb7
commit 06cbd1fce1
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
packages/server/src/utils/builders/compose.ts
View File

@@ -148,8 +148,17 @@ const sanitizeCommand = (command: string) => {
export const createCommand = (compose: ComposeNested) => { export const createCommand = (compose: ComposeNested) => {
const { composeType, appName, sourceType } = compose; const { composeType, appName, sourceType } = compose;
const path = let path = "";
sourceType === "raw" ? "docker-compose.processed.yml" : compose.composePath;
if (sourceType !== "raw") {
path = compose.composePath;
} else {
path =
composeType === "stack"
? "docker-compose.processed.yml"
: "docker-compose.yml";
}
let command = ""; let command = "";
if (composeType === "docker-compose") { if (composeType === "docker-compose") {
@@ -196,13 +205,9 @@ export const processComposeFile = async (compose: ComposeNested) => {
const { COMPOSE_PATH } = paths(); const { COMPOSE_PATH } = paths();
const command = getProcessComposeFileCommand(compose); const command = getProcessComposeFileCommand(compose);
if (compose.serverId) { await execAsync(command, {
await execAsyncRemote(compose.serverId, command); cwd: join(COMPOSE_PATH, compose.appName, "code"),
} else { });
await execAsync(command, {
cwd: join(COMPOSE_PATH, compose.appName, "code"),
});
}
}; };
export const getProcessComposeFileCommand = (compose: ComposeNested) => { export const getProcessComposeFileCommand = (compose: ComposeNested) => {
@@ -214,10 +219,6 @@ export const getProcessComposeFileCommand = (compose: ComposeNested) => {
command = `export $(grep -v '^#' .env | xargs) && docker stack config -c docker-compose.yml > docker-compose.processed.yml`; command = `export $(grep -v '^#' .env | xargs) && docker stack config -c docker-compose.yml > docker-compose.processed.yml`;
} }
if (composeType === "docker-compose") {
command = "cp docker-compose.yml docker-compose.processed.yml";
}
return command; return command;
}; };