From 94786c738bb255378a581e591c798aa780341239 Mon Sep 17 00:00:00 2001 From: xenonwellz <59710311+xenonwellz@users.noreply.github.com> Date: Fri, 1 Nov 2024 15:27:00 +0100 Subject: [PATCH 01/23] feat: added env support for dokploy --- .../services/compose/[composeId].tsx | 10 +--- packages/server/src/utils/builders/compose.ts | 48 ++++++++++++++++++- 2 files changed, 49 insertions(+), 9 deletions(-) diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx index 60ddfeab..bcac11ed 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx @@ -185,18 +185,12 @@ const Service = (
General - {data?.composeType === "docker-compose" && ( - Environment - )} + Environment {!data?.serverId && ( Monitoring )} diff --git a/packages/server/src/utils/builders/compose.ts b/packages/server/src/utils/builders/compose.ts index 7d3ce0ec..c2924897 100644 --- a/packages/server/src/utils/builders/compose.ts +++ b/packages/server/src/utils/builders/compose.ts @@ -2,12 +2,14 @@ import { createWriteStream, existsSync, mkdirSync, + readFileSync, writeFileSync, } from "node:fs"; import { dirname, join } from "node:path"; import { paths } from "@dokploy/server/constants"; import type { InferResultType } from "@dokploy/server/types/with"; import boxen from "boxen"; +import dotenv from "dotenv"; import { writeDomainsToCompose, writeDomainsToComposeRemote, @@ -28,6 +30,7 @@ export const buildCompose = async (compose: ComposeNested, logPath: string) => { const command = createCommand(compose); await writeDomainsToCompose(compose, domains); createEnvFile(compose); + processComposeFile(compose); const logContent = ` App Name: ${appName} @@ -84,6 +87,7 @@ export const getBuildComposeCommand = async ( const command = createCommand(compose); const envCommand = getCreateEnvFileCommand(compose); const projectPath = join(COMPOSE_PATH, compose.appName, "code"); + const processComposeFileCommand = getProcessComposeFileCommand(compose); const newCompose = await writeDomainsToComposeRemote( compose, @@ -119,6 +123,8 @@ Compose Type: ${composeType} ✅`; cd "${projectPath}"; + ${processComposeFileCommand} + docker ${command.split(" ").join(" ")} >> "${logPath}" 2>&1 || { echo "Error: ❌ Docker command failed" >> "${logPath}"; exit 1; } echo "Docker Compose Deployed: ✅" >> "${logPath}" @@ -145,7 +151,7 @@ export const createCommand = (compose: ComposeNested) => { const { composeType, appName, sourceType } = compose; const path = - sourceType === "raw" ? "docker-compose.yml" : compose.composePath; + sourceType === "raw" ? "docker-compose.processed.yml" : compose.composePath; let command = ""; if (composeType === "docker-compose") { @@ -188,6 +194,46 @@ const createEnvFile = (compose: ComposeNested) => { writeFileSync(envFilePath, envFileContent); }; +export const processComposeFile = (compose: ComposeNested) => { + const { COMPOSE_PATH } = paths(); + const { env, appName, sourceType, composeType } = compose; + + if (composeType === "stack") { + const inputPath = + sourceType === "raw" ? "docker-compose.yml" : compose.composePath; + const composeInputFilePath = + join(COMPOSE_PATH, appName, "code", inputPath) || + join(COMPOSE_PATH, appName, "code", "docker-compose.yml"); + + const outputPath = "docker-compose.processed.yml"; + const composeOutputFilePath = + join(COMPOSE_PATH, appName, "code", outputPath) || + join(COMPOSE_PATH, appName, "code", "docker-compose.processed.yml"); + + const envContent = prepareEnvironmentVariables(env || "").join("\n"); + const envVariables = dotenv.parse(envContent); + + let templateContent = readFileSync(composeInputFilePath, "utf8"); + + templateContent = templateContent.replace( + /\$\{([^}]+)\}/g, + (_, varName) => { + return envVariables[varName] || ""; + }, + ); + + writeFileSync(composeOutputFilePath, templateContent); + } +}; + +export const getProcessComposeFileCommand = (compose: ComposeNested) => { + const { composeType } = compose; + if (composeType === "stack") { + return "set -a; source .env; set +a; envsubst < docker-compose.yml > docker-compose.processed.yml"; + } + return "cp docker-compose.yml docker-compose.processed.yml"; +}; + export const getCreateEnvFileCommand = (compose: ComposeNested) => { const { COMPOSE_PATH } = paths(true); const { env, composePath, appName } = compose; From cb02deb837065438cc6de1f431d9297485b1279a Mon Sep 17 00:00:00 2001 From: xenonwellz <59710311+xenonwellz@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:15:12 +0100 Subject: [PATCH 02/23] fix(builder): fixed docker-compose issue --- packages/server/src/utils/builders/compose.ts | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/server/src/utils/builders/compose.ts b/packages/server/src/utils/builders/compose.ts index c2924897..fd9824eb 100644 --- a/packages/server/src/utils/builders/compose.ts +++ b/packages/server/src/utils/builders/compose.ts @@ -198,32 +198,32 @@ export const processComposeFile = (compose: ComposeNested) => { const { COMPOSE_PATH } = paths(); const { env, appName, sourceType, composeType } = compose; + const inputPath = + sourceType === "raw" ? "docker-compose.yml" : compose.composePath; + const composeInputFilePath = + join(COMPOSE_PATH, appName, "code", inputPath) || + join(COMPOSE_PATH, appName, "code", "docker-compose.yml"); + + const outputPath = "docker-compose.processed.yml"; + const composeOutputFilePath = + join(COMPOSE_PATH, appName, "code", outputPath) || + join(COMPOSE_PATH, appName, "code", "docker-compose.processed.yml"); + + let templateContent = readFileSync(composeInputFilePath, "utf8"); + if (composeType === "stack") { - const inputPath = - sourceType === "raw" ? "docker-compose.yml" : compose.composePath; - const composeInputFilePath = - join(COMPOSE_PATH, appName, "code", inputPath) || - join(COMPOSE_PATH, appName, "code", "docker-compose.yml"); - - const outputPath = "docker-compose.processed.yml"; - const composeOutputFilePath = - join(COMPOSE_PATH, appName, "code", outputPath) || - join(COMPOSE_PATH, appName, "code", "docker-compose.processed.yml"); - const envContent = prepareEnvironmentVariables(env || "").join("\n"); const envVariables = dotenv.parse(envContent); - let templateContent = readFileSync(composeInputFilePath, "utf8"); - templateContent = templateContent.replace( /\$\{([^}]+)\}/g, (_, varName) => { return envVariables[varName] || ""; }, ); - - writeFileSync(composeOutputFilePath, templateContent); } + + writeFileSync(composeOutputFilePath, templateContent); }; export const getProcessComposeFileCommand = (compose: ComposeNested) => { From dc1e12d6ed19ae1ec9d2e7b69b97d6a35464bd8b Mon Sep 17 00:00:00 2001 From: xenonwellz <59710311+xenonwellz@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:35:42 +0100 Subject: [PATCH 03/23] feat(compose): added stop functionality for stack --- .../components/dashboard/compose/general/actions.tsx | 2 +- packages/server/src/services/compose.ts | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/apps/dokploy/components/dashboard/compose/general/actions.tsx b/apps/dokploy/components/dashboard/compose/general/actions.tsx index 365e37f5..37f8ffa8 100644 --- a/apps/dokploy/components/dashboard/compose/general/actions.tsx +++ b/apps/dokploy/components/dashboard/compose/general/actions.tsx @@ -71,7 +71,7 @@ export const ComposeActions = ({ composeId }: Props) => { Autodeploy {data?.autoDeploy && } - {data?.composeType === "docker-compose" && ( + {["running", "done"].includes(data?.composeStatus || "") && ( )} diff --git a/packages/server/src/services/compose.ts b/packages/server/src/services/compose.ts index 61d7e5fc..7382fa99 100644 --- a/packages/server/src/services/compose.ts +++ b/packages/server/src/services/compose.ts @@ -476,6 +476,17 @@ export const stopCompose = async (composeId: string) => { } } + if (compose.composeType === "stack") { + if (compose.serverId) { + await execAsyncRemote( + compose.serverId, + `docker stack rm ${compose.appName}`, + ); + } else { + await execAsync(`docker stack rm ${compose.appName}`); + } + } + await updateCompose(composeId, { composeStatus: "idle", }); From 06081627e85fec85198f9bc7c17ae1b0239251b0 Mon Sep 17 00:00:00 2001 From: xenonwellz <59710311+xenonwellz@users.noreply.github.com> Date: Sat, 2 Nov 2024 00:35:38 +0100 Subject: [PATCH 04/23] refactor: used docker stack config --- packages/server/src/utils/builders/compose.ts | 52 ++++++++----------- 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/packages/server/src/utils/builders/compose.ts b/packages/server/src/utils/builders/compose.ts index fd9824eb..8d521d61 100644 --- a/packages/server/src/utils/builders/compose.ts +++ b/packages/server/src/utils/builders/compose.ts @@ -15,7 +15,7 @@ import { writeDomainsToComposeRemote, } from "../docker/domain"; import { encodeBase64, prepareEnvironmentVariables } from "../docker/utils"; -import { execAsyncRemote } from "../process/execAsync"; +import { execAsync, execAsyncRemote } from "../process/execAsync"; import { spawnAsync } from "../process/spawnAsync"; export type ComposeNested = InferResultType< @@ -30,7 +30,7 @@ export const buildCompose = async (compose: ComposeNested, logPath: string) => { const command = createCommand(compose); await writeDomainsToCompose(compose, domains); createEnvFile(compose); - processComposeFile(compose); + await processComposeFile(compose); const logContent = ` App Name: ${appName} @@ -194,44 +194,34 @@ const createEnvFile = (compose: ComposeNested) => { writeFileSync(envFilePath, envFileContent); }; -export const processComposeFile = (compose: ComposeNested) => { +export const processComposeFile = async (compose: ComposeNested) => { const { COMPOSE_PATH } = paths(); - const { env, appName, sourceType, composeType } = compose; + let command = getProcessComposeFileCommand(compose); - const inputPath = - sourceType === "raw" ? "docker-compose.yml" : compose.composePath; - const composeInputFilePath = - join(COMPOSE_PATH, appName, "code", inputPath) || - join(COMPOSE_PATH, appName, "code", "docker-compose.yml"); - - const outputPath = "docker-compose.processed.yml"; - const composeOutputFilePath = - join(COMPOSE_PATH, appName, "code", outputPath) || - join(COMPOSE_PATH, appName, "code", "docker-compose.processed.yml"); - - let templateContent = readFileSync(composeInputFilePath, "utf8"); - - if (composeType === "stack") { - const envContent = prepareEnvironmentVariables(env || "").join("\n"); - const envVariables = dotenv.parse(envContent); - - templateContent = templateContent.replace( - /\$\{([^}]+)\}/g, - (_, varName) => { - return envVariables[varName] || ""; - }, - ); + if (compose.serverId) { + command = `cd ${join(COMPOSE_PATH, compose.appName, "code")} && ${command}`; + await execAsyncRemote(compose.serverId, command); + } else { + await execAsync(command, { + cwd: join(COMPOSE_PATH, compose.appName, "code"), + }); } - - writeFileSync(composeOutputFilePath, templateContent); }; export const getProcessComposeFileCommand = (compose: ComposeNested) => { const { composeType } = compose; + + let command = ""; + if (composeType === "stack") { - return "set -a; source .env; set +a; envsubst < docker-compose.yml > docker-compose.processed.yml"; + command = `export $(grep -v '^#' .env | xargs) && docker stack config -c docker-compose.yml > docker-compose.processed.yml`; } - return "cp docker-compose.yml docker-compose.processed.yml"; + + if (composeType === "docker-compose") { + command = "cp docker-compose.yml docker-compose.processed.yml"; + } + + return command; }; export const getCreateEnvFileCommand = (compose: ComposeNested) => { From 9c355bcfb7426fc31b0f0b57d46989f96256c0c2 Mon Sep 17 00:00:00 2001 From: xenonwellz <59710311+xenonwellz@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:42:53 +0100 Subject: [PATCH 05/23] refactor(builder): removed unused and redundant code --- packages/server/src/utils/builders/compose.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/server/src/utils/builders/compose.ts b/packages/server/src/utils/builders/compose.ts index 8d521d61..dd48e0c2 100644 --- a/packages/server/src/utils/builders/compose.ts +++ b/packages/server/src/utils/builders/compose.ts @@ -2,14 +2,12 @@ import { createWriteStream, existsSync, mkdirSync, - readFileSync, writeFileSync, } from "node:fs"; import { dirname, join } from "node:path"; import { paths } from "@dokploy/server/constants"; import type { InferResultType } from "@dokploy/server/types/with"; import boxen from "boxen"; -import dotenv from "dotenv"; import { writeDomainsToCompose, writeDomainsToComposeRemote, @@ -196,10 +194,9 @@ const createEnvFile = (compose: ComposeNested) => { export const processComposeFile = async (compose: ComposeNested) => { const { COMPOSE_PATH } = paths(); - let command = getProcessComposeFileCommand(compose); + const command = getProcessComposeFileCommand(compose); if (compose.serverId) { - command = `cd ${join(COMPOSE_PATH, compose.appName, "code")} && ${command}`; await execAsyncRemote(compose.serverId, command); } else { await execAsync(command, { From 06cbd1fce1a96692917e7c6b88b87155174e77d7 Mon Sep 17 00:00:00 2001 From: xenonwellz <59710311+xenonwellz@users.noreply.github.com> Date: Sun, 3 Nov 2024 15:26:54 +0100 Subject: [PATCH 06/23] refactor(bundler): removed redundant code --- packages/server/src/utils/builders/compose.ts | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/packages/server/src/utils/builders/compose.ts b/packages/server/src/utils/builders/compose.ts index dd48e0c2..514d7bd8 100644 --- a/packages/server/src/utils/builders/compose.ts +++ b/packages/server/src/utils/builders/compose.ts @@ -148,8 +148,17 @@ const sanitizeCommand = (command: string) => { export const createCommand = (compose: ComposeNested) => { const { composeType, appName, sourceType } = compose; - const path = - sourceType === "raw" ? "docker-compose.processed.yml" : compose.composePath; + let path = ""; + + if (sourceType !== "raw") { + path = compose.composePath; + } else { + path = + composeType === "stack" + ? "docker-compose.processed.yml" + : "docker-compose.yml"; + } + let command = ""; if (composeType === "docker-compose") { @@ -196,13 +205,9 @@ export const processComposeFile = async (compose: ComposeNested) => { const { COMPOSE_PATH } = paths(); const command = getProcessComposeFileCommand(compose); - if (compose.serverId) { - await execAsyncRemote(compose.serverId, command); - } else { - await execAsync(command, { - cwd: join(COMPOSE_PATH, compose.appName, "code"), - }); - } + await execAsync(command, { + cwd: join(COMPOSE_PATH, compose.appName, "code"), + }); }; 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`; } - if (composeType === "docker-compose") { - command = "cp docker-compose.yml docker-compose.processed.yml"; - } - return command; }; From f772fec407d937b92812d092ac00001cb7744a44 Mon Sep 17 00:00:00 2001 From: xenonwellz <59710311+xenonwellz@users.noreply.github.com> Date: Mon, 4 Nov 2024 11:02:46 +0100 Subject: [PATCH 07/23] fix(bundler): docker-compose bug --- packages/server/src/utils/builders/compose.ts | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/server/src/utils/builders/compose.ts b/packages/server/src/utils/builders/compose.ts index 514d7bd8..8941f4e1 100644 --- a/packages/server/src/utils/builders/compose.ts +++ b/packages/server/src/utils/builders/compose.ts @@ -150,15 +150,17 @@ export const createCommand = (compose: ComposeNested) => { let path = ""; - if (sourceType !== "raw") { - path = compose.composePath; - } else { + if (sourceType === "raw") { path = composeType === "stack" ? "docker-compose.processed.yml" : "docker-compose.yml"; + } else { + path = compose.composePath; } + console.log(path); + let command = ""; if (composeType === "docker-compose") { @@ -203,11 +205,12 @@ const createEnvFile = (compose: ComposeNested) => { export const processComposeFile = async (compose: ComposeNested) => { const { COMPOSE_PATH } = paths(); - const command = getProcessComposeFileCommand(compose); - - await execAsync(command, { - cwd: join(COMPOSE_PATH, compose.appName, "code"), - }); + if (compose.composeType === "stack") { + const command = getProcessComposeFileCommand(compose); + await execAsync(command, { + cwd: join(COMPOSE_PATH, compose.appName, "code"), + }); + } }; export const getProcessComposeFileCommand = (compose: ComposeNested) => { From dafed3096f80c282e1033c2c6e51393db1fdd16f Mon Sep 17 00:00:00 2001 From: xenonwellz <59710311+xenonwellz@users.noreply.github.com> Date: Mon, 4 Nov 2024 22:47:58 +0100 Subject: [PATCH 08/23] refactor(builder): removed path log --- packages/server/src/utils/builders/compose.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/server/src/utils/builders/compose.ts b/packages/server/src/utils/builders/compose.ts index 8941f4e1..38d94ab1 100644 --- a/packages/server/src/utils/builders/compose.ts +++ b/packages/server/src/utils/builders/compose.ts @@ -159,8 +159,6 @@ export const createCommand = (compose: ComposeNested) => { path = compose.composePath; } - console.log(path); - let command = ""; if (composeType === "docker-compose") { From c9b570e4697607141e246f88b194eb1539d94bd4 Mon Sep 17 00:00:00 2001 From: xenonwellz <59710311+xenonwellz@users.noreply.github.com> Date: Sat, 9 Nov 2024 13:00:15 +0100 Subject: [PATCH 09/23] fix(builder): fixed issues on non-raw compose and external servers --- packages/server/src/utils/builders/compose.ts | 44 ++++++++----------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/packages/server/src/utils/builders/compose.ts b/packages/server/src/utils/builders/compose.ts index 38d94ab1..233e236b 100644 --- a/packages/server/src/utils/builders/compose.ts +++ b/packages/server/src/utils/builders/compose.ts @@ -148,32 +148,22 @@ const sanitizeCommand = (command: string) => { export const createCommand = (compose: ComposeNested) => { const { composeType, appName, sourceType } = compose; - let path = ""; - - if (sourceType === "raw") { - path = - composeType === "stack" + const path = + sourceType === "raw" + ? composeType === "stack" ? "docker-compose.processed.yml" - : "docker-compose.yml"; - } else { - path = compose.composePath; - } + : "docker-compose.yml" + : composeType === "stack" + ? "docker-compose.processed.yml" + : compose.composePath; - let command = ""; - - if (composeType === "docker-compose") { - command = `compose -p ${appName} -f ${path} up -d --build --remove-orphans`; - } else if (composeType === "stack") { - command = `stack deploy -c ${path} ${appName} --prune`; - } + const baseCommand = + composeType === "docker-compose" + ? `compose -p ${appName} -f ${path} up -d --build --remove-orphans` + : `stack deploy -c ${path} ${appName} --prune`; const customCommand = sanitizeCommand(compose.command); - - if (customCommand) { - command = `${command} ${customCommand}`; - } - - return command; + return customCommand ? `${baseCommand} ${customCommand}` : baseCommand; }; const createEnvFile = (compose: ComposeNested) => { @@ -212,12 +202,16 @@ export const processComposeFile = async (compose: ComposeNested) => { }; export const getProcessComposeFileCommand = (compose: ComposeNested) => { - const { composeType } = compose; + const { composeType, sourceType } = compose; + const composePath = + sourceType === "raw" ? "docker-compose.yml" : compose.composePath; let command = ""; - if (composeType === "stack") { - 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 ${composePath} > docker-compose.processed.yml`, + ].join(" && "); } return command; From 65ee0a3e2264d9325cbb800e533d5f45ce9b889d Mon Sep 17 00:00:00 2001 From: xenonwellz <59710311+xenonwellz@users.noreply.github.com> Date: Mon, 11 Nov 2024 02:22:48 +0100 Subject: [PATCH 10/23] fix(builder): created processed file in the same directory as main stack.yml --- packages/server/src/utils/builders/compose.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/server/src/utils/builders/compose.ts b/packages/server/src/utils/builders/compose.ts index 233e236b..b09333ba 100644 --- a/packages/server/src/utils/builders/compose.ts +++ b/packages/server/src/utils/builders/compose.ts @@ -154,7 +154,7 @@ export const createCommand = (compose: ComposeNested) => { ? "docker-compose.processed.yml" : "docker-compose.yml" : composeType === "stack" - ? "docker-compose.processed.yml" + ? join(dirname(compose.composePath), "docker-compose.processed.yml") : compose.composePath; const baseCommand = @@ -206,11 +206,17 @@ export const getProcessComposeFileCommand = (compose: ComposeNested) => { const composePath = sourceType === "raw" ? "docker-compose.yml" : compose.composePath; + + const destinationPath = + sourceType === "raw" + ? "docker-compose.processed.yml" + : join(dirname(compose.composePath), "docker-compose.processed.yml"); + let command = ""; if (composeType === "stack") { command = [ "export $(grep -v '^#' .env | xargs)", - `docker stack config -c ${composePath} > docker-compose.processed.yml`, + `docker stack config -c ${composePath} > ${destinationPath}`, ].join(" && "); } From a46cbf4f2cc217cec0a58329c065e76aee7b645d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Gabriel?= Date: Tue, 14 Jan 2025 08:36:29 -0300 Subject: [PATCH 11/23] feat: evolution api template --- .../dokploy/public/templates/evolutionapi.png | Bin 0 -> 17605 bytes .../templates/evolutionapi/docker-compose.yml | 61 ++++++++++++++++++ apps/dokploy/templates/evolutionapi/index.ts | 59 +++++++++++++++++ apps/dokploy/templates/templates.ts | 15 +++++ 4 files changed, 135 insertions(+) create mode 100644 apps/dokploy/public/templates/evolutionapi.png create mode 100644 apps/dokploy/templates/evolutionapi/docker-compose.yml create mode 100644 apps/dokploy/templates/evolutionapi/index.ts diff --git a/apps/dokploy/public/templates/evolutionapi.png b/apps/dokploy/public/templates/evolutionapi.png new file mode 100644 index 0000000000000000000000000000000000000000..bd9b3850a53b5524e9c04f1d2cec3a290bcd34d5 GIT binary patch literal 17605 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 vOD!H~BD9@CSy!f$khTB(|E import("./conduit/index").then((m) => m.generate), }, + { + id: "evolutionapi", + name: "Evolution API", + version: "v2.1.2", + description: + "Evolution API is a robust platform dedicated to empowering small businesses with limited resources, going beyond a simple messaging solution via WhatsApp.", + logo: "evolutionapi.png", + links: { + github: "https://github.com/EvolutionAPI/evolution-api", + docs: "https://doc.evolution-api.com/v2/en/get-started/introduction", + website: "https://evolution-api.com/opensource-whatsapp-api/", + }, + tags: ["api", "whatsapp", "messaging"], + load: () => import("./evolutionapi/index").then((m) => m.generate), + }, ]; From df43f8318a70b17cc7354c878315cd0f385493f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Gabriel?= Date: Fri, 17 Jan 2025 10:37:01 -0300 Subject: [PATCH 12/23] fix: evolution api database provider --- apps/dokploy/templates/evolutionapi/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/templates/evolutionapi/index.ts b/apps/dokploy/templates/evolutionapi/index.ts index 39c4328e..98e37529 100644 --- a/apps/dokploy/templates/evolutionapi/index.ts +++ b/apps/dokploy/templates/evolutionapi/index.ts @@ -33,7 +33,7 @@ export function generate(schema: Schema): Template { "TELEMETRY_URL=", "POSTGRES_DATABASE=evolution", - "POSTGRES_USERNAME=postgres", + "POSTGRES_USERNAME=postgresql", `POSTGRES_PASSWORD=${postgresPassword}`, "DATABASE_ENABLED=true", "DATABASE_PROVIDER=postgres", From e21e0e18654bff0474de4c0807b0c2fc6f76ddf0 Mon Sep 17 00:00:00 2001 From: Jannis Milz <67200746+jannismilz@users.noreply.github.com> Date: Tue, 28 Jan 2025 12:24:54 +0100 Subject: [PATCH 13/23] feat: Upgrade listmonk version and remove automatic admin credentials creation --- apps/dokploy/templates/listmonk/docker-compose.yml | 6 +++--- apps/dokploy/templates/listmonk/index.ts | 7 +------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/apps/dokploy/templates/listmonk/docker-compose.yml b/apps/dokploy/templates/listmonk/docker-compose.yml index 725d0a09..17b09f41 100644 --- a/apps/dokploy/templates/listmonk/docker-compose.yml +++ b/apps/dokploy/templates/listmonk/docker-compose.yml @@ -1,6 +1,6 @@ services: db: - image: postgres:13 + image: postgres:17-alpine ports: - 5432 networks: @@ -19,7 +19,7 @@ services: - listmonk-data:/var/lib/postgresql/data setup: - image: listmonk/listmonk:v3.0.0 + image: listmonk/listmonk:v4.1.0 networks: - dokploy-network volumes: @@ -35,7 +35,7 @@ services: app: restart: unless-stopped - image: listmonk/listmonk:v3.0.0 + image: listmonk/listmonk:v4.1.0 environment: - TZ=Etc/UTC depends_on: diff --git a/apps/dokploy/templates/listmonk/index.ts b/apps/dokploy/templates/listmonk/index.ts index 725659ca..113b3862 100644 --- a/apps/dokploy/templates/listmonk/index.ts +++ b/apps/dokploy/templates/listmonk/index.ts @@ -2,13 +2,11 @@ import { type DomainSchema, type Schema, type Template, - generatePassword, generateRandomDomain, } from "../utils"; export function generate(schema: Schema): Template { const randomDomain = generateRandomDomain(schema); - const adminPassword = generatePassword(32); const domains: DomainSchema[] = [ { @@ -19,7 +17,7 @@ export function generate(schema: Schema): Template { ]; const envs = [ - `# login with admin:${adminPassword}`, + `# visit the page to setup your super admin user`, "# check config.toml in Advanced / Volumes for more options", ]; @@ -29,9 +27,6 @@ export function generate(schema: Schema): Template { content: `[app] address = "0.0.0.0:9000" -admin_username = "admin" -admin_password = "${adminPassword}" - [db] host = "db" port = 5432 From b96169fa5523e9fc1a5c70130142c228354a003c Mon Sep 17 00:00:00 2001 From: Muhammet Emin Akalan Date: Tue, 28 Jan 2025 15:31:20 +0300 Subject: [PATCH 14/23] fix: teable template --- apps/dokploy/templates/teable/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/templates/teable/docker-compose.yml b/apps/dokploy/templates/teable/docker-compose.yml index b96b677c..959de21c 100644 --- a/apps/dokploy/templates/teable/docker-compose.yml +++ b/apps/dokploy/templates/teable/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.9" services: teable: - image: ghcr.io/teableio/teable:1.3.1-alpha-build.460 + image: ghcr.io/teableio/teable:latest restart: always volumes: - teable-data:/app/.assets From de4d1c0911e0b0d9cb6ad3d2a1765783eeab783e Mon Sep 17 00:00:00 2001 From: Freilyn Bernabe Date: Wed, 29 Jan 2025 00:39:01 -0400 Subject: [PATCH 15/23] feat(template): add Formbricks template with Docker Compose and environment setup --- apps/dokploy/public/templates/formbricks.png | Bin 0 -> 74620 bytes .../templates/formbricks/docker-compose.yml | 38 +++++++++++++++++ apps/dokploy/templates/formbricks/index.ts | 39 ++++++++++++++++++ apps/dokploy/templates/templates.ts | 15 +++++++ 4 files changed, 92 insertions(+) create mode 100644 apps/dokploy/public/templates/formbricks.png create mode 100644 apps/dokploy/templates/formbricks/docker-compose.yml create mode 100644 apps/dokploy/templates/formbricks/index.ts diff --git a/apps/dokploy/public/templates/formbricks.png b/apps/dokploy/public/templates/formbricks.png new file mode 100644 index 0000000000000000000000000000000000000000..2bf1ca1fbc667c45bf30306342b6646e6c248988 GIT binary patch literal 74620 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 import("./shlink/index").then((m) => m.generate), }, + { + id: "formbricks", + name: "Formbricks", + version: "v3.1.3", + description: + "Formbricks es una plataforma de encuestas y formularios open-source para recolectar datos de usuarios.", + logo: "formbricks.png", + links: { + github: "https://github.com/formbricks/formbricks", + website: "https://formbricks.com/", + docs: "https://formbricks.com/docs", + }, + tags: ["forms", "analytics"], + load: () => import("./formbricks/index").then((m) => m.generate), + }, ]; From 00d2b3b572d2c190e50da57ec86e5034e15198aa Mon Sep 17 00:00:00 2001 From: Freilyn Bernabe Date: Wed, 29 Jan 2025 07:26:14 -0400 Subject: [PATCH 16/23] fix: changing the description of formbricks to english --- apps/dokploy/templates/templates.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/templates/templates.ts b/apps/dokploy/templates/templates.ts index e8c99e97..781aa03f 100644 --- a/apps/dokploy/templates/templates.ts +++ b/apps/dokploy/templates/templates.ts @@ -1443,7 +1443,7 @@ export const templates: TemplateData[] = [ name: "Formbricks", version: "v3.1.3", description: - "Formbricks es una plataforma de encuestas y formularios open-source para recolectar datos de usuarios.", + "Formbricks is an open-source survey and form platform for collecting user data.", logo: "formbricks.png", links: { github: "https://github.com/formbricks/formbricks", From 6b48c0f354fd06352e775a64f8c92f5294b18b96 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Thu, 30 Jan 2025 23:24:12 -0600 Subject: [PATCH 17/23] fix: correct env values --- apps/dokploy/templates/evolutionapi/index.ts | 96 ++++++++++---------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/apps/dokploy/templates/evolutionapi/index.ts b/apps/dokploy/templates/evolutionapi/index.ts index 98e37529..bd3e81aa 100644 --- a/apps/dokploy/templates/evolutionapi/index.ts +++ b/apps/dokploy/templates/evolutionapi/index.ts @@ -1,59 +1,59 @@ import { - type DomainSchema, - type Schema, - type Template, - generateBase64, - generatePassword, - generateRandomDomain, + type DomainSchema, + type Schema, + type Template, + generateBase64, + generatePassword, + generateRandomDomain, } from "../utils"; export function generate(schema: Schema): Template { - const mainDomain = generateRandomDomain(schema); - const apiKey = generateBase64(64); - const postgresPassword = generatePassword(); + const mainDomain = generateRandomDomain(schema); + const apiKey = generateBase64(64); + const postgresPassword = generatePassword(); - const domains: DomainSchema[] = [ - { - host: mainDomain, - port: 8080, - serviceName: "evolution-api", - }, - ]; + const domains: DomainSchema[] = [ + { + host: mainDomain, + port: 8080, + serviceName: "evolution-api", + }, + ]; - const envs = [ - `SERVER_URL=https://${mainDomain}`, - "AUTHENTICATION_TYPE=apikey", - `AUTHENTICATION_API_KEY=${apiKey}`, - "AUTHENTICATION_EXPOSE_IN_FETCH_INSTANCES=true", + const envs = [ + `SERVER_URL=https://${mainDomain}`, + "AUTHENTICATION_TYPE=apikey", + `AUTHENTICATION_API_KEY=${apiKey}`, + "AUTHENTICATION_EXPOSE_IN_FETCH_INSTANCES=true", - "LANGUAGE=en", - "CONFIG_SESSION_PHONE_CLIENT=Evolution API", - "CONFIG_SESSION_PHONE_NAME=Chrome", - "TELEMETRY=false", - "TELEMETRY_URL=", + "LANGUAGE=en", + "CONFIG_SESSION_PHONE_CLIENT=Evolution API", + "CONFIG_SESSION_PHONE_NAME=Chrome", + "TELEMETRY=false", + "TELEMETRY_URL=", - "POSTGRES_DATABASE=evolution", - "POSTGRES_USERNAME=postgresql", - `POSTGRES_PASSWORD=${postgresPassword}`, - "DATABASE_ENABLED=true", - "DATABASE_PROVIDER=postgres", - `DATABASE_CONNECTION_URI=postgres://postgres:${postgresPassword}@evolution-postgres:5432/evolution`, - "DATABASE_SAVE_DATA_INSTANCE=true", - "DATABASE_SAVE_DATA_NEW_MESSAGE=true", - "DATABASE_SAVE_MESSAGE_UPDATE=true", - "DATABASE_SAVE_DATA_CONTACTS=true", - "DATABASE_SAVE_DATA_CHATS=true", - "DATABASE_SAVE_DATA_LABELS=true", - "DATABASE_SAVE_DATA_HISTORIC=true", + "POSTGRES_DATABASE=evolution", + "POSTGRES_USERNAME=postgresql", + `POSTGRES_PASSWORD=${postgresPassword}`, + "DATABASE_ENABLED=true", + "DATABASE_PROVIDER=postgresql", + `DATABASE_CONNECTION_URI=postgres://postgresql:${postgresPassword}@evolution-postgres:5432/evolution`, + "DATABASE_SAVE_DATA_INSTANCE=true", + "DATABASE_SAVE_DATA_NEW_MESSAGE=true", + "DATABASE_SAVE_MESSAGE_UPDATE=true", + "DATABASE_SAVE_DATA_CONTACTS=true", + "DATABASE_SAVE_DATA_CHATS=true", + "DATABASE_SAVE_DATA_LABELS=true", + "DATABASE_SAVE_DATA_HISTORIC=true", - "CACHE_REDIS_ENABLED=true", - "CACHE_REDIS_URI=redis://evolution-redis:6379", - "CACHE_REDIS_PREFIX_KEY=evolution", - "CACHE_REDIS_SAVE_INSTANCES=true", - ]; + "CACHE_REDIS_ENABLED=true", + "CACHE_REDIS_URI=redis://evolution-redis:6379", + "CACHE_REDIS_PREFIX_KEY=evolution", + "CACHE_REDIS_SAVE_INSTANCES=true", + ]; - return { - domains, - envs, - }; + return { + domains, + envs, + }; } From 1787c524f0af4dbd6f45306d0d7dba79b6f12b62 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Thu, 30 Jan 2025 23:31:33 -0600 Subject: [PATCH 18/23] Update apps/dokploy/templates/formbricks/docker-compose.yml --- apps/dokploy/templates/formbricks/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/templates/formbricks/docker-compose.yml b/apps/dokploy/templates/formbricks/docker-compose.yml index 823fe7d3..558f8b4d 100644 --- a/apps/dokploy/templates/formbricks/docker-compose.yml +++ b/apps/dokploy/templates/formbricks/docker-compose.yml @@ -27,7 +27,7 @@ services: depends_on: - postgres ports: - - ${PORT}:3000 + - 3000 volumes: - ../files/uploads:/home/nextjs/apps/web/uploads/ <<: *environment From 1342f73a024a698153861f1365001b8c3ce30cce Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Thu, 30 Jan 2025 23:31:39 -0600 Subject: [PATCH 19/23] Update apps/dokploy/templates/formbricks/index.ts --- apps/dokploy/templates/formbricks/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/templates/formbricks/index.ts b/apps/dokploy/templates/formbricks/index.ts index 2448065e..7e94dc35 100644 --- a/apps/dokploy/templates/formbricks/index.ts +++ b/apps/dokploy/templates/formbricks/index.ts @@ -26,7 +26,7 @@ export function generate(schema: Schema): Template { `NEXTAUTH_SECRET=${secretBase}`, `ENCRYPTION_KEY=${encryptionKey}`, `CRON_SECRET=${cronSecret}`, - "PORT=8080", + ]; const mounts: Template["mounts"] = []; From 208094cd3ee7ca695aebc42e1dcd108423a0ded1 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Thu, 30 Jan 2025 23:31:43 -0600 Subject: [PATCH 20/23] Update apps/dokploy/templates/formbricks/index.ts --- apps/dokploy/templates/formbricks/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/templates/formbricks/index.ts b/apps/dokploy/templates/formbricks/index.ts index 7e94dc35..8cede8ed 100644 --- a/apps/dokploy/templates/formbricks/index.ts +++ b/apps/dokploy/templates/formbricks/index.ts @@ -15,7 +15,7 @@ export function generate(schema: Schema): Template { const domains: DomainSchema[] = [ { host: mainDomain, - port: 8080, + port: 3000, serviceName: "formbricks", }, ]; From f7a29accb1d8335b200dca58cc6d911cc7158b16 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Thu, 30 Jan 2025 23:40:01 -0600 Subject: [PATCH 21/23] refactor: lint --- apps/dokploy/templates/listmonk/index.ts | 54 ++++++++++++------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/apps/dokploy/templates/listmonk/index.ts b/apps/dokploy/templates/listmonk/index.ts index f0dad544..2a25efca 100644 --- a/apps/dokploy/templates/listmonk/index.ts +++ b/apps/dokploy/templates/listmonk/index.ts @@ -1,30 +1,30 @@ import { - type DomainSchema, - type Schema, - type Template, - generateRandomDomain, + type DomainSchema, + type Schema, + type Template, + generateRandomDomain, } from "../utils"; export function generate(schema: Schema): Template { - const randomDomain = generateRandomDomain(schema); + const randomDomain = generateRandomDomain(schema); - const domains: DomainSchema[] = [ - { - host: randomDomain, - port: 9000, - serviceName: "app", - }, - ]; + const domains: DomainSchema[] = [ + { + host: randomDomain, + port: 9000, + serviceName: "app", + }, + ]; - const envs = [ - "# visit the page to setup your super admin user", - "# check config.toml in Advanced / Volumes for more options", - ]; + const envs = [ + "# visit the page to setup your super admin user", + "# check config.toml in Advanced / Volumes for more options", + ]; - const mounts: Template["mounts"] = [ - { - filePath: "config.toml", - content: `[app] + const mounts: Template["mounts"] = [ + { + filePath: "config.toml", + content: `[app] address = "0.0.0.0:9000" [db] @@ -41,12 +41,12 @@ max_lifetime = "300s" params = "" `, - }, - ]; + }, + ]; - return { - envs, - mounts, - domains, - }; + return { + envs, + mounts, + domains, + }; } From 009859faa9dfffc755da97c95c10f5acb3105b47 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Fri, 31 Jan 2025 01:20:10 -0600 Subject: [PATCH 22/23] refactor: add .env docker stack --- .../services/compose/[composeId].tsx | 6 +- packages/server/src/utils/builders/compose.ts | 339 ++++---- packages/server/src/utils/docker/utils.ts | 815 +++++++++--------- 3 files changed, 571 insertions(+), 589 deletions(-) diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx index 9f4e9086..f9ece2e7 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx @@ -211,12 +211,12 @@ const Service = ( diff --git a/packages/server/src/utils/builders/compose.ts b/packages/server/src/utils/builders/compose.ts index 2573626a..03da7858 100644 --- a/packages/server/src/utils/builders/compose.ts +++ b/packages/server/src/utils/builders/compose.ts @@ -1,99 +1,105 @@ import { - createWriteStream, - existsSync, - mkdirSync, - writeFileSync, + createWriteStream, + existsSync, + mkdirSync, + readFileSync, + writeFileSync, } from "node:fs"; import { dirname, join } from "node:path"; import { paths } from "@dokploy/server/constants"; import type { InferResultType } from "@dokploy/server/types/with"; import boxen from "boxen"; import { - writeDomainsToCompose, - writeDomainsToComposeRemote, + writeDomainsToCompose, + writeDomainsToComposeRemote, } from "../docker/domain"; -import { encodeBase64, prepareEnvironmentVariables } from "../docker/utils"; +import { + encodeBase64, + getEnviromentVariablesObject, + prepareEnvironmentVariables, +} from "../docker/utils"; import { execAsync, execAsyncRemote } from "../process/execAsync"; import { spawnAsync } from "../process/spawnAsync"; export type ComposeNested = InferResultType< - "compose", - { project: true; mounts: true; domains: true } + "compose", + { project: true; mounts: true; domains: true } >; export const buildCompose = async (compose: ComposeNested, logPath: string) => { - const writeStream = createWriteStream(logPath, { flags: "a" }); - const { sourceType, appName, mounts, composeType, domains } = compose; - try { - const { COMPOSE_PATH } = paths(); - const command = createCommand(compose); - await writeDomainsToCompose(compose, domains); - createEnvFile(compose); - await processComposeFile(compose); + const writeStream = createWriteStream(logPath, { flags: "a" }); + const { sourceType, appName, mounts, composeType, domains } = compose; + try { + const { COMPOSE_PATH } = paths(); + const command = createCommand(compose); + await writeDomainsToCompose(compose, domains); + createEnvFile(compose); - const logContent = ` -App Name: ${appName} -Build Compose 🐳 -Detected: ${mounts.length} mounts 📂 -Command: docker ${command} -Source Type: docker ${sourceType} ✅ -Compose Type: ${composeType} ✅`; - const logBox = boxen(logContent, { - padding: { - left: 1, - right: 1, - bottom: 1, - }, - width: 80, - borderStyle: "double", - }); - writeStream.write(`\n${logBox}\n`); + const logContent = ` + App Name: ${appName} + Build Compose 🐳 + Detected: ${mounts.length} mounts 📂 + Command: docker ${command} + Source Type: docker ${sourceType} ✅ + Compose Type: ${composeType} ✅`; + const logBox = boxen(logContent, { + padding: { + left: 1, + right: 1, + bottom: 1, + }, + width: 80, + borderStyle: "double", + }); + writeStream.write(`\n${logBox}\n`); + const projectPath = join(COMPOSE_PATH, compose.appName, "code"); - const projectPath = join(COMPOSE_PATH, compose.appName, "code"); + await spawnAsync( + "docker", + [...command.split(" ")], + (data) => { + if (writeStream.writable) { + writeStream.write(data.toString()); + } + }, + { + cwd: projectPath, + env: { + NODE_ENV: process.env.NODE_ENV, + PATH: process.env.PATH, + ...(composeType === "stack" && { + ...getEnviromentVariablesObject(compose.env, compose.project.env), + }), + }, + } + ); - await spawnAsync( - "docker", - [...command.split(" ")], - (data) => { - if (writeStream.writable) { - writeStream.write(data.toString()); - } - }, - { - cwd: projectPath, - env: { - NODE_ENV: process.env.NODE_ENV, - PATH: process.env.PATH, - }, - }, - ); - - writeStream.write("Docker Compose Deployed: ✅"); - } catch (error) { - writeStream.write(`Error ❌ ${(error as Error).message}`); - throw error; - } finally { - writeStream.end(); - } + writeStream.write("Docker Compose Deployed: ✅"); + } catch (error) { + writeStream.write(`Error ❌ ${(error as Error).message}`); + throw error; + } finally { + writeStream.end(); + } }; export const getBuildComposeCommand = async ( - compose: ComposeNested, - logPath: string, + compose: ComposeNested, + logPath: string ) => { - const { COMPOSE_PATH } = paths(true); - const { sourceType, appName, mounts, composeType, domains, composePath } = - compose; - const command = createCommand(compose); - const envCommand = getCreateEnvFileCommand(compose); - const projectPath = join(COMPOSE_PATH, compose.appName, "code"); - const processComposeFileCommand = getProcessComposeFileCommand(compose); + const { COMPOSE_PATH } = paths(true); + const { sourceType, appName, mounts, composeType, domains, composePath } = + compose; + const command = createCommand(compose); + const envCommand = getCreateEnvFileCommand(compose); + const projectPath = join(COMPOSE_PATH, compose.appName, "code"); + const exportEnvCommand = getExportEnvCommand(compose); - const newCompose = await writeDomainsToComposeRemote( - compose, - domains, - logPath, - ); - const logContent = ` + const newCompose = await writeDomainsToComposeRemote( + compose, + domains, + logPath + ); + const logContent = ` App Name: ${appName} Build Compose 🐳 Detected: ${mounts.length} mounts 📂 @@ -101,17 +107,17 @@ Command: docker ${command} Source Type: docker ${sourceType} ✅ Compose Type: ${composeType} ✅`; - const logBox = boxen(logContent, { - padding: { - left: 1, - right: 1, - bottom: 1, - }, - width: 80, - borderStyle: "double", - }); + const logBox = boxen(logContent, { + padding: { + left: 1, + right: 1, + bottom: 1, + }, + width: 80, + borderStyle: "double", + }); - const bashCommand = ` + const bashCommand = ` set -e { echo "${logBox}" >> "${logPath}" @@ -122,7 +128,7 @@ Compose Type: ${composeType} ✅`; cd "${projectPath}"; - ${processComposeFileCommand} + ${exportEnvCommand} docker ${command.split(" ").join(" ")} >> "${logPath}" 2>&1 || { echo "Error: ❌ Docker command failed" >> "${logPath}"; exit 1; } @@ -133,129 +139,102 @@ Compose Type: ${composeType} ✅`; } `; - return await execAsyncRemote(compose.serverId, bashCommand); + return await execAsyncRemote(compose.serverId, bashCommand); }; const sanitizeCommand = (command: string) => { - const sanitizedCommand = command.trim(); + const sanitizedCommand = command.trim(); - const parts = sanitizedCommand.split(/\s+/); + const parts = sanitizedCommand.split(/\s+/); - const restCommand = parts.map((arg) => arg.replace(/^"(.*)"$/, "$1")); + const restCommand = parts.map((arg) => arg.replace(/^"(.*)"$/, "$1")); - return restCommand.join(" "); + return restCommand.join(" "); }; export const createCommand = (compose: ComposeNested) => { - const { composeType, appName, sourceType } = compose; + const { composeType, appName, sourceType } = compose; - if (compose.command) { - return `${sanitizeCommand(compose.command)}`; - } + if (compose.command) { + return `${sanitizeCommand(compose.command)}`; + } - const path = - sourceType === "raw" - ? composeType === "stack" - ? "docker-compose.processed.yml" - : "docker-compose.yml" - : composeType === "stack" - ? join(dirname(compose.composePath), "docker-compose.processed.yml") - : compose.composePath; + const path = + sourceType === "raw" ? "docker-compose.yml" : compose.composePath; + let command = ""; - const baseCommand = - composeType === "docker-compose" - ? `compose -p ${appName} -f ${path} up -d --build --remove-orphans` - : `stack deploy -c ${path} ${appName} --prune`; - const customCommand = sanitizeCommand(compose.command); - return customCommand ? `${baseCommand} ${customCommand}` : baseCommand; + if (composeType === "stack") { + command = `stack deploy -c ${path} ${appName} --prune`; + } + + return command; }; const createEnvFile = (compose: ComposeNested) => { - const { COMPOSE_PATH } = paths(); - const { env, composePath, appName } = compose; - const composeFilePath = - join(COMPOSE_PATH, appName, "code", composePath) || - join(COMPOSE_PATH, appName, "code", "docker-compose.yml"); + const { COMPOSE_PATH } = paths(); + const { env, composePath, appName } = compose; + const composeFilePath = + join(COMPOSE_PATH, appName, "code", composePath) || + join(COMPOSE_PATH, appName, "code", "docker-compose.yml"); - const envFilePath = join(dirname(composeFilePath), ".env"); - let envContent = env || ""; - if (!envContent.includes("DOCKER_CONFIG")) { - envContent += "\nDOCKER_CONFIG=/root/.docker/config.json"; - } + const envFilePath = join(dirname(composeFilePath), ".env"); + let envContent = env || ""; + if (!envContent.includes("DOCKER_CONFIG")) { + envContent += "\nDOCKER_CONFIG=/root/.docker/config.json"; + } - if (compose.randomize) { - envContent += `\nCOMPOSE_PREFIX=${compose.suffix}`; - } + if (compose.randomize) { + envContent += `\nCOMPOSE_PREFIX=${compose.suffix}`; + } - const envFileContent = prepareEnvironmentVariables( - envContent, - compose.project.env, - ).join("\n"); + const envFileContent = prepareEnvironmentVariables( + envContent, + compose.project.env + ).join("\n"); - if (!existsSync(dirname(envFilePath))) { - mkdirSync(dirname(envFilePath), { recursive: true }); - } - writeFileSync(envFilePath, envFileContent); -}; - -export const processComposeFile = async (compose: ComposeNested) => { - const { COMPOSE_PATH } = paths(); - if (compose.composeType === "stack") { - const command = getProcessComposeFileCommand(compose); - await execAsync(command, { - cwd: join(COMPOSE_PATH, compose.appName, "code"), - }); - } -}; - -export const getProcessComposeFileCommand = (compose: ComposeNested) => { - const { composeType, sourceType } = compose; - - const composePath = - sourceType === "raw" ? "docker-compose.yml" : compose.composePath; - - const destinationPath = - sourceType === "raw" - ? "docker-compose.processed.yml" - : join(dirname(compose.composePath), "docker-compose.processed.yml"); - - let command = ""; - if (composeType === "stack") { - command = [ - "export $(grep -v '^#' .env | xargs)", - `docker stack config -c ${composePath} > ${destinationPath}`, - ].join(" && "); - } - - return command; + if (!existsSync(dirname(envFilePath))) { + mkdirSync(dirname(envFilePath), { recursive: true }); + } + writeFileSync(envFilePath, envFileContent); }; export const getCreateEnvFileCommand = (compose: ComposeNested) => { - const { COMPOSE_PATH } = paths(true); - const { env, composePath, appName } = compose; - const composeFilePath = - join(COMPOSE_PATH, appName, "code", composePath) || - join(COMPOSE_PATH, appName, "code", "docker-compose.yml"); + const { COMPOSE_PATH } = paths(true); + const { env, composePath, appName } = compose; + const composeFilePath = + join(COMPOSE_PATH, appName, "code", composePath) || + join(COMPOSE_PATH, appName, "code", "docker-compose.yml"); - const envFilePath = join(dirname(composeFilePath), ".env"); + const envFilePath = join(dirname(composeFilePath), ".env"); - let envContent = env || ""; - if (!envContent.includes("DOCKER_CONFIG")) { - envContent += "\nDOCKER_CONFIG=/root/.docker/config.json"; - } + let envContent = env || ""; + if (!envContent.includes("DOCKER_CONFIG")) { + envContent += "\nDOCKER_CONFIG=/root/.docker/config.json"; + } - if (compose.randomize) { - envContent += `\nCOMPOSE_PREFIX=${compose.suffix}`; - } + if (compose.randomize) { + envContent += `\nCOMPOSE_PREFIX=${compose.suffix}`; + } - const envFileContent = prepareEnvironmentVariables( - envContent, - compose.project.env, - ).join("\n"); + const envFileContent = prepareEnvironmentVariables( + envContent, + compose.project.env + ).join("\n"); - const encodedContent = encodeBase64(envFileContent); - return ` + const encodedContent = encodeBase64(envFileContent); + return ` touch ${envFilePath}; echo "${encodedContent}" | base64 -d > "${envFilePath}"; `; }; + +const getExportEnvCommand = (compose: ComposeNested) => { + if (compose.composeType !== "stack") return ""; + + const envVars = getEnviromentVariablesObject(compose.env, compose.project.env); + const exports = Object.entries(envVars) + .map(([key, value]) => `export ${key}=${JSON.stringify(value)}`) + .join("\n"); + + return exports ? `\n# Export environment variables\n${exports}\n` : ""; +}; diff --git a/packages/server/src/utils/docker/utils.ts b/packages/server/src/utils/docker/utils.ts index 64e98306..96b2e08b 100644 --- a/packages/server/src/utils/docker/utils.ts +++ b/packages/server/src/utils/docker/utils.ts @@ -15,526 +15,529 @@ import { spawnAsync } from "../process/spawnAsync"; import { getRemoteDocker } from "../servers/remote-docker"; interface RegistryAuth { - username: string; - password: string; - registryUrl: string; + username: string; + password: string; + registryUrl: string; } export const pullImage = async ( - dockerImage: string, - onData?: (data: any) => void, - authConfig?: Partial, + dockerImage: string, + onData?: (data: any) => void, + authConfig?: Partial ): Promise => { - try { - if (!dockerImage) { - throw new Error("Docker image not found"); - } + try { + if (!dockerImage) { + throw new Error("Docker image not found"); + } - if (authConfig?.username && authConfig?.password) { - await spawnAsync( - "docker", - [ - "login", - authConfig.registryUrl || "", - "-u", - authConfig.username, - "-p", - authConfig.password, - ], - onData, - ); - } - await spawnAsync("docker", ["pull", dockerImage], onData); - } catch (error) { - throw error; - } + if (authConfig?.username && authConfig?.password) { + await spawnAsync( + "docker", + [ + "login", + authConfig.registryUrl || "", + "-u", + authConfig.username, + "-p", + authConfig.password, + ], + onData + ); + } + await spawnAsync("docker", ["pull", dockerImage], onData); + } catch (error) { + throw error; + } }; export const pullRemoteImage = async ( - dockerImage: string, - serverId: string, - onData?: (data: any) => void, - authConfig?: Partial, + dockerImage: string, + serverId: string, + onData?: (data: any) => void, + authConfig?: Partial ): Promise => { - try { - if (!dockerImage) { - throw new Error("Docker image not found"); - } + try { + if (!dockerImage) { + throw new Error("Docker image not found"); + } - const remoteDocker = await getRemoteDocker(serverId); + const remoteDocker = await getRemoteDocker(serverId); - await new Promise((resolve, reject) => { - remoteDocker.pull( - dockerImage, - { authconfig: authConfig }, - (err, stream) => { - if (err) { - reject(err); - return; - } + await new Promise((resolve, reject) => { + remoteDocker.pull( + dockerImage, + { authconfig: authConfig }, + (err, stream) => { + if (err) { + reject(err); + return; + } - remoteDocker.modem.followProgress( - stream as Readable, - (err: Error | null, res) => { - if (!err) { - resolve(res); - } - if (err) { - reject(err); - } - }, - (event) => { - onData?.(event); - }, - ); - }, - ); - }); - } catch (error) { - throw error; - } + remoteDocker.modem.followProgress( + stream as Readable, + (err: Error | null, res) => { + if (!err) { + resolve(res); + } + if (err) { + reject(err); + } + }, + (event) => { + onData?.(event); + } + ); + } + ); + }); + } catch (error) { + throw error; + } }; export const containerExists = async (containerName: string) => { - const container = docker.getContainer(containerName); - try { - await container.inspect(); - return true; - } catch (error) { - return false; - } + const container = docker.getContainer(containerName); + try { + await container.inspect(); + return true; + } catch (error) { + return false; + } }; export const stopService = async (appName: string) => { - try { - await execAsync(`docker service scale ${appName}=0 `); - } catch (error) { - console.error(error); - return error; - } + try { + await execAsync(`docker service scale ${appName}=0 `); + } catch (error) { + console.error(error); + return error; + } }; export const stopServiceRemote = async (serverId: string, appName: string) => { - try { - await execAsyncRemote(serverId, `docker service scale ${appName}=0 `); - } catch (error) { - console.error(error); - return error; - } + try { + await execAsyncRemote(serverId, `docker service scale ${appName}=0 `); + } catch (error) { + console.error(error); + return error; + } }; export const getContainerByName = (name: string): Promise => { - const opts = { - limit: 1, - filters: { - name: [name], - }, - }; - return new Promise((resolve, reject) => { - docker.listContainers(opts, (err, containers) => { - if (err) { - reject(err); - } else if (containers?.length === 0) { - reject(new Error(`No container found with name: ${name}`)); - } else if (containers && containers?.length > 0 && containers[0]) { - resolve(containers[0]); - } - }); - }); + const opts = { + limit: 1, + filters: { + name: [name], + }, + }; + return new Promise((resolve, reject) => { + docker.listContainers(opts, (err, containers) => { + if (err) { + reject(err); + } else if (containers?.length === 0) { + reject(new Error(`No container found with name: ${name}`)); + } else if (containers && containers?.length > 0 && containers[0]) { + resolve(containers[0]); + } + }); + }); }; 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; - } + 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) => { - try { - const command = "docker container prune --force"; - if (serverId) { - await execAsyncRemote(serverId, command); - } else { - await execAsync(command); - } - } catch (error) { - console.error(error); - throw error; - } + try { + const command = "docker container prune --force"; + if (serverId) { + await execAsyncRemote(serverId, command); + } else { + await execAsync(command); + } + } catch (error) { + console.error(error); + throw error; + } }; export const cleanUpUnusedVolumes = async (serverId?: string) => { - try { - const command = "docker volume prune --force"; - if (serverId) { - await execAsyncRemote(serverId, command); - } else { - await execAsync(command); - } - } catch (error) { - console.error(error); - throw error; - } + try { + const command = "docker volume prune --force"; + if (serverId) { + await execAsyncRemote(serverId, command); + } else { + await execAsync(command); + } + } catch (error) { + console.error(error); + throw error; + } }; export const cleanUpInactiveContainers = async () => { - try { - const containers = await docker.listContainers({ all: true }); - const inactiveContainers = containers.filter( - (container) => container.State !== "running", - ); + try { + const containers = await docker.listContainers({ all: true }); + const inactiveContainers = containers.filter( + (container) => container.State !== "running" + ); - for (const container of inactiveContainers) { - await docker.getContainer(container.Id).remove({ force: true }); - console.log(`Cleaning up inactive container: ${container.Id}`); - } - } catch (error) { - console.error("Error cleaning up inactive containers:", error); - throw error; - } + for (const container of inactiveContainers) { + await docker.getContainer(container.Id).remove({ force: true }); + console.log(`Cleaning up inactive container: ${container.Id}`); + } + } catch (error) { + console.error("Error cleaning up inactive containers:", error); + throw error; + } }; export const cleanUpDockerBuilder = async (serverId?: string) => { - const command = "docker builder prune --all --force"; - if (serverId) { - await execAsyncRemote(serverId, command); - } else { - await execAsync(command); - } + const command = "docker builder prune --all --force"; + if (serverId) { + await execAsyncRemote(serverId, command); + } else { + await execAsync(command); + } }; export const cleanUpSystemPrune = async (serverId?: string) => { - const command = "docker system prune --all --force --volumes"; - if (serverId) { - await execAsyncRemote(serverId, command); - } else { - await execAsync(command); - } + const command = "docker system prune --all --force --volumes"; + if (serverId) { + await execAsyncRemote(serverId, command); + } else { + await execAsync(command); + } }; export const startService = async (appName: string) => { - try { - await execAsync(`docker service scale ${appName}=1 `); - } catch (error) { - console.error(error); - throw error; - } + try { + await execAsync(`docker service scale ${appName}=1 `); + } catch (error) { + console.error(error); + throw error; + } }; export const startServiceRemote = async (serverId: string, appName: string) => { - try { - await execAsyncRemote(serverId, `docker service scale ${appName}=1 `); - } catch (error) { - console.error(error); - throw error; - } + try { + await execAsyncRemote(serverId, `docker service scale ${appName}=1 `); + } catch (error) { + console.error(error); + throw error; + } }; export const removeService = async ( - appName: string, - serverId?: string | null, - deleteVolumes = false, + appName: string, + serverId?: string | null, + deleteVolumes = false ) => { - try { - const command = `docker service rm ${appName}`; + try { + const command = `docker service rm ${appName}`; - if (serverId) { - await execAsyncRemote(serverId, command); - } else { - await execAsync(command); - } - } catch (error) { - return error; - } + if (serverId) { + await execAsyncRemote(serverId, command); + } else { + await execAsync(command); + } + } catch (error) { + return error; + } }; export const prepareEnvironmentVariables = ( - serviceEnv: string | null, - projectEnv?: string | null, + serviceEnv: string | null, + projectEnv?: string | null ) => { - const projectVars = parse(projectEnv ?? ""); - const serviceVars = parse(serviceEnv ?? ""); + const projectVars = parse(projectEnv ?? ""); + const serviceVars = parse(serviceEnv ?? ""); - const resolvedVars = Object.entries(serviceVars).map(([key, value]) => { - let resolvedValue = value; - if (projectVars) { - resolvedValue = value.replace(/\$\{\{project\.(.*?)\}\}/g, (_, ref) => { - if (projectVars[ref] !== undefined) { - return projectVars[ref]; - } - throw new Error(`Invalid project environment variable: project.${ref}`); - }); - } - return `${key}=${resolvedValue}`; - }); + const resolvedVars = Object.entries(serviceVars).map(([key, value]) => { + let resolvedValue = value; + if (projectVars) { + resolvedValue = value.replace(/\$\{\{project\.(.*?)\}\}/g, (_, ref) => { + if (projectVars[ref] !== undefined) { + return projectVars[ref]; + } + throw new Error(`Invalid project environment variable: project.${ref}`); + }); + } + return `${key}=${resolvedValue}`; + }); - return resolvedVars; + return resolvedVars; }; -export const prepareBuildArgs = (input: string | null) => { - const pairs = (input ?? "").split("\n"); +export const getEnviromentVariablesObject = ( + input: string | null, + projectEnv?: string | null +) => { + const envs = prepareEnvironmentVariables(input, projectEnv); - const jsonObject: Record = {}; + const jsonObject: Record = {}; - for (const pair of pairs) { - const [key, value] = pair.split("="); - if (key && value) { - jsonObject[key] = value; - } - } + for (const pair of envs) { + const [key, value] = pair.split("="); + if (key && value) { + jsonObject[key] = value; + } + } - return jsonObject; + return jsonObject; }; export const generateVolumeMounts = (mounts: ApplicationNested["mounts"]) => { - if (!mounts || mounts.length === 0) { - return []; - } + if (!mounts || mounts.length === 0) { + return []; + } - return mounts - .filter((mount) => mount.type === "volume") - .map((mount) => ({ - Type: "volume" as const, - Source: mount.volumeName || "", - Target: mount.mountPath, - })); + return mounts + .filter((mount) => mount.type === "volume") + .map((mount) => ({ + Type: "volume" as const, + Source: mount.volumeName || "", + Target: mount.mountPath, + })); }; type Resources = { - memoryLimit: string | null; - memoryReservation: string | null; - cpuLimit: string | null; - cpuReservation: string | null; + memoryLimit: string | null; + memoryReservation: string | null; + cpuLimit: string | null; + cpuReservation: string | null; }; export const calculateResources = ({ - memoryLimit, - memoryReservation, - cpuLimit, - cpuReservation, + memoryLimit, + memoryReservation, + cpuLimit, + cpuReservation, }: Resources): ResourceRequirements => { - return { - Limits: { - MemoryBytes: memoryLimit ? Number.parseInt(memoryLimit) : undefined, - NanoCPUs: cpuLimit ? Number.parseInt(cpuLimit) : undefined, - }, - Reservations: { - MemoryBytes: memoryReservation - ? Number.parseInt(memoryReservation) - : undefined, - NanoCPUs: cpuReservation ? Number.parseInt(cpuReservation) : undefined, - }, - }; + return { + Limits: { + MemoryBytes: memoryLimit ? Number.parseInt(memoryLimit) : undefined, + NanoCPUs: cpuLimit ? Number.parseInt(cpuLimit) : undefined, + }, + Reservations: { + MemoryBytes: memoryReservation + ? Number.parseInt(memoryReservation) + : undefined, + NanoCPUs: cpuReservation ? Number.parseInt(cpuReservation) : undefined, + }, + }; }; export const generateConfigContainer = (application: ApplicationNested) => { - const { - healthCheckSwarm, - restartPolicySwarm, - placementSwarm, - updateConfigSwarm, - rollbackConfigSwarm, - modeSwarm, - labelsSwarm, - replicas, - mounts, - networkSwarm, - } = application; + const { + healthCheckSwarm, + restartPolicySwarm, + placementSwarm, + updateConfigSwarm, + rollbackConfigSwarm, + modeSwarm, + labelsSwarm, + replicas, + mounts, + networkSwarm, + } = application; - const haveMounts = mounts.length > 0; + const haveMounts = mounts.length > 0; - return { - ...(healthCheckSwarm && { - HealthCheck: healthCheckSwarm, - }), - ...(restartPolicySwarm - ? { - RestartPolicy: restartPolicySwarm, - } - : {}), - ...(placementSwarm - ? { - Placement: placementSwarm, - } - : { - // if app have mounts keep manager as constraint - Placement: { - Constraints: haveMounts ? ["node.role==manager"] : [], - }, - }), - ...(labelsSwarm && { - Labels: labelsSwarm, - }), - ...(modeSwarm - ? { - Mode: modeSwarm, - } - : { - // use replicas value if no modeSwarm provided - Mode: { - Replicated: { - Replicas: replicas, - }, - }, - }), - ...(rollbackConfigSwarm && { - RollbackConfig: rollbackConfigSwarm, - }), - ...(updateConfigSwarm - ? { UpdateConfig: updateConfigSwarm } - : { - // default config if no updateConfigSwarm provided - UpdateConfig: { - Parallelism: 1, - Order: "start-first", - }, - }), - ...(networkSwarm - ? { - Networks: networkSwarm, - } - : { - Networks: [{ Target: "dokploy-network" }], - }), - }; + return { + ...(healthCheckSwarm && { + HealthCheck: healthCheckSwarm, + }), + ...(restartPolicySwarm + ? { + RestartPolicy: restartPolicySwarm, + } + : {}), + ...(placementSwarm + ? { + Placement: placementSwarm, + } + : { + // if app have mounts keep manager as constraint + Placement: { + Constraints: haveMounts ? ["node.role==manager"] : [], + }, + }), + ...(labelsSwarm && { + Labels: labelsSwarm, + }), + ...(modeSwarm + ? { + Mode: modeSwarm, + } + : { + // use replicas value if no modeSwarm provided + Mode: { + Replicated: { + Replicas: replicas, + }, + }, + }), + ...(rollbackConfigSwarm && { + RollbackConfig: rollbackConfigSwarm, + }), + ...(updateConfigSwarm + ? { UpdateConfig: updateConfigSwarm } + : { + // default config if no updateConfigSwarm provided + UpdateConfig: { + Parallelism: 1, + Order: "start-first", + }, + }), + ...(networkSwarm + ? { + Networks: networkSwarm, + } + : { + Networks: [{ Target: "dokploy-network" }], + }), + }; }; export const generateBindMounts = (mounts: ApplicationNested["mounts"]) => { - if (!mounts || mounts.length === 0) { - return []; - } + if (!mounts || mounts.length === 0) { + return []; + } - return mounts - .filter((mount) => mount.type === "bind") - .map((mount) => ({ - Type: "bind" as const, - Source: mount.hostPath || "", - Target: mount.mountPath, - })); + return mounts + .filter((mount) => mount.type === "bind") + .map((mount) => ({ + Type: "bind" as const, + Source: mount.hostPath || "", + Target: mount.mountPath, + })); }; export const generateFileMounts = ( - appName: string, - service: - | ApplicationNested - | MongoNested - | MariadbNested - | MysqlNested - | PostgresNested - | RedisNested, + appName: string, + service: + | ApplicationNested + | MongoNested + | MariadbNested + | MysqlNested + | PostgresNested + | RedisNested ) => { - const { mounts } = service; - const { APPLICATIONS_PATH } = paths(!!service.serverId); - if (!mounts || mounts.length === 0) { - return []; - } + const { mounts } = service; + const { APPLICATIONS_PATH } = paths(!!service.serverId); + if (!mounts || mounts.length === 0) { + return []; + } - return mounts - .filter((mount) => mount.type === "file") - .map((mount) => { - const fileName = mount.filePath; - const absoluteBasePath = path.resolve(APPLICATIONS_PATH); - const directory = path.join(absoluteBasePath, appName, "files"); - const sourcePath = path.join(directory, fileName || ""); - return { - Type: "bind" as const, - Source: sourcePath, - Target: mount.mountPath, - }; - }); + return mounts + .filter((mount) => mount.type === "file") + .map((mount) => { + const fileName = mount.filePath; + const absoluteBasePath = path.resolve(APPLICATIONS_PATH); + const directory = path.join(absoluteBasePath, appName, "files"); + const sourcePath = path.join(directory, fileName || ""); + return { + Type: "bind" as const, + Source: sourcePath, + Target: mount.mountPath, + }; + }); }; export const createFile = async ( - outputPath: string, - filePath: string, - content: string, + outputPath: string, + filePath: string, + content: string ) => { - try { - const fullPath = path.join(outputPath, filePath); - if (fullPath.endsWith(path.sep) || filePath.endsWith("/")) { - fs.mkdirSync(fullPath, { recursive: true }); - return; - } + try { + const fullPath = path.join(outputPath, filePath); + if (fullPath.endsWith(path.sep) || filePath.endsWith("/")) { + fs.mkdirSync(fullPath, { recursive: true }); + return; + } - const directory = path.dirname(fullPath); - fs.mkdirSync(directory, { recursive: true }); - fs.writeFileSync(fullPath, content || ""); - } catch (error) { - throw error; - } + const directory = path.dirname(fullPath); + fs.mkdirSync(directory, { recursive: true }); + fs.writeFileSync(fullPath, content || ""); + } catch (error) { + throw error; + } }; export const encodeBase64 = (content: string) => - Buffer.from(content, "utf-8").toString("base64"); + Buffer.from(content, "utf-8").toString("base64"); export const getCreateFileCommand = ( - outputPath: string, - filePath: string, - content: string, + outputPath: string, + filePath: string, + content: string ) => { - const fullPath = path.join(outputPath, filePath); - if (fullPath.endsWith(path.sep) || filePath.endsWith("/")) { - return `mkdir -p ${fullPath};`; - } + const fullPath = path.join(outputPath, filePath); + if (fullPath.endsWith(path.sep) || filePath.endsWith("/")) { + return `mkdir -p ${fullPath};`; + } - const directory = path.dirname(fullPath); - const encodedContent = encodeBase64(content); - return ` + const directory = path.dirname(fullPath); + const encodedContent = encodeBase64(content); + return ` mkdir -p ${directory}; echo "${encodedContent}" | base64 -d > "${fullPath}"; `; }; export const getServiceContainer = async (appName: string) => { - try { - const filter = { - status: ["running"], - label: [`com.docker.swarm.service.name=${appName}`], - }; + try { + const filter = { + status: ["running"], + label: [`com.docker.swarm.service.name=${appName}`], + }; - const containers = await docker.listContainers({ - filters: JSON.stringify(filter), - }); + const containers = await docker.listContainers({ + filters: JSON.stringify(filter), + }); - if (containers.length === 0 || !containers[0]) { - throw new Error(`No container found with name: ${appName}`); - } + if (containers.length === 0 || !containers[0]) { + throw new Error(`No container found with name: ${appName}`); + } - const container = containers[0]; + const container = containers[0]; - return container; - } catch (error) { - throw error; - } + return container; + } catch (error) { + throw error; + } }; export const getRemoteServiceContainer = async ( - serverId: string, - appName: string, + serverId: string, + appName: string ) => { - try { - const filter = { - status: ["running"], - label: [`com.docker.swarm.service.name=${appName}`], - }; - const remoteDocker = await getRemoteDocker(serverId); - const containers = await remoteDocker.listContainers({ - filters: JSON.stringify(filter), - }); + try { + const filter = { + status: ["running"], + label: [`com.docker.swarm.service.name=${appName}`], + }; + const remoteDocker = await getRemoteDocker(serverId); + const containers = await remoteDocker.listContainers({ + filters: JSON.stringify(filter), + }); - if (containers.length === 0 || !containers[0]) { - throw new Error(`No container found with name: ${appName}`); - } + if (containers.length === 0 || !containers[0]) { + throw new Error(`No container found with name: ${appName}`); + } - const container = containers[0]; + const container = containers[0]; - return container; - } catch (error) { - throw error; - } + return container; + } catch (error) { + throw error; + } }; From 7369b54f322c324d04a5296a64338d61e26432ee Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Fri, 31 Jan 2025 01:20:52 -0600 Subject: [PATCH 23/23] refactor: update --- .../services/compose/[composeId].tsx | 2 - packages/server/src/utils/builders/compose.ts | 295 +++---- packages/server/src/utils/docker/utils.ts | 814 +++++++++--------- 3 files changed, 556 insertions(+), 555 deletions(-) diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx index f9ece2e7..67c9c7b1 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx @@ -221,9 +221,7 @@ const Service = ( )} > General - {/* {data?.composeType === "docker-compose" && ( */} Environment - {/* )} */} {!data?.serverId && ( Monitoring )} diff --git a/packages/server/src/utils/builders/compose.ts b/packages/server/src/utils/builders/compose.ts index 03da7858..af560728 100644 --- a/packages/server/src/utils/builders/compose.ts +++ b/packages/server/src/utils/builders/compose.ts @@ -1,105 +1,105 @@ import { - createWriteStream, - existsSync, - mkdirSync, - readFileSync, - writeFileSync, + createWriteStream, + existsSync, + mkdirSync, + readFileSync, + writeFileSync, } from "node:fs"; import { dirname, join } from "node:path"; import { paths } from "@dokploy/server/constants"; import type { InferResultType } from "@dokploy/server/types/with"; import boxen from "boxen"; import { - writeDomainsToCompose, - writeDomainsToComposeRemote, + writeDomainsToCompose, + writeDomainsToComposeRemote, } from "../docker/domain"; import { - encodeBase64, - getEnviromentVariablesObject, - prepareEnvironmentVariables, + encodeBase64, + getEnviromentVariablesObject, + prepareEnvironmentVariables, } from "../docker/utils"; import { execAsync, execAsyncRemote } from "../process/execAsync"; import { spawnAsync } from "../process/spawnAsync"; export type ComposeNested = InferResultType< - "compose", - { project: true; mounts: true; domains: true } + "compose", + { project: true; mounts: true; domains: true } >; export const buildCompose = async (compose: ComposeNested, logPath: string) => { - const writeStream = createWriteStream(logPath, { flags: "a" }); - const { sourceType, appName, mounts, composeType, domains } = compose; - try { - const { COMPOSE_PATH } = paths(); - const command = createCommand(compose); - await writeDomainsToCompose(compose, domains); - createEnvFile(compose); + const writeStream = createWriteStream(logPath, { flags: "a" }); + const { sourceType, appName, mounts, composeType, domains } = compose; + try { + const { COMPOSE_PATH } = paths(); + const command = createCommand(compose); + await writeDomainsToCompose(compose, domains); + createEnvFile(compose); - const logContent = ` + const logContent = ` App Name: ${appName} Build Compose 🐳 Detected: ${mounts.length} mounts 📂 Command: docker ${command} Source Type: docker ${sourceType} ✅ Compose Type: ${composeType} ✅`; - const logBox = boxen(logContent, { - padding: { - left: 1, - right: 1, - bottom: 1, - }, - width: 80, - borderStyle: "double", - }); - writeStream.write(`\n${logBox}\n`); - const projectPath = join(COMPOSE_PATH, compose.appName, "code"); + const logBox = boxen(logContent, { + padding: { + left: 1, + right: 1, + bottom: 1, + }, + width: 80, + borderStyle: "double", + }); + writeStream.write(`\n${logBox}\n`); + const projectPath = join(COMPOSE_PATH, compose.appName, "code"); - await spawnAsync( - "docker", - [...command.split(" ")], - (data) => { - if (writeStream.writable) { - writeStream.write(data.toString()); - } - }, - { - cwd: projectPath, - env: { - NODE_ENV: process.env.NODE_ENV, - PATH: process.env.PATH, - ...(composeType === "stack" && { - ...getEnviromentVariablesObject(compose.env, compose.project.env), - }), - }, - } - ); + await spawnAsync( + "docker", + [...command.split(" ")], + (data) => { + if (writeStream.writable) { + writeStream.write(data.toString()); + } + }, + { + cwd: projectPath, + env: { + NODE_ENV: process.env.NODE_ENV, + PATH: process.env.PATH, + ...(composeType === "stack" && { + ...getEnviromentVariablesObject(compose.env, compose.project.env), + }), + }, + }, + ); - writeStream.write("Docker Compose Deployed: ✅"); - } catch (error) { - writeStream.write(`Error ❌ ${(error as Error).message}`); - throw error; - } finally { - writeStream.end(); - } + writeStream.write("Docker Compose Deployed: ✅"); + } catch (error) { + writeStream.write(`Error ❌ ${(error as Error).message}`); + throw error; + } finally { + writeStream.end(); + } }; export const getBuildComposeCommand = async ( - compose: ComposeNested, - logPath: string + compose: ComposeNested, + logPath: string, ) => { - const { COMPOSE_PATH } = paths(true); - const { sourceType, appName, mounts, composeType, domains, composePath } = - compose; - const command = createCommand(compose); - const envCommand = getCreateEnvFileCommand(compose); - const projectPath = join(COMPOSE_PATH, compose.appName, "code"); - const exportEnvCommand = getExportEnvCommand(compose); + const { COMPOSE_PATH } = paths(true); + const { sourceType, appName, mounts, composeType, domains, composePath } = + compose; + const command = createCommand(compose); + const envCommand = getCreateEnvFileCommand(compose); + const projectPath = join(COMPOSE_PATH, compose.appName, "code"); + const exportEnvCommand = getExportEnvCommand(compose); - const newCompose = await writeDomainsToComposeRemote( - compose, - domains, - logPath - ); - const logContent = ` + const newCompose = await writeDomainsToComposeRemote( + compose, + domains, + logPath, + ); + const logContent = ` App Name: ${appName} Build Compose 🐳 Detected: ${mounts.length} mounts 📂 @@ -107,17 +107,17 @@ Command: docker ${command} Source Type: docker ${sourceType} ✅ Compose Type: ${composeType} ✅`; - const logBox = boxen(logContent, { - padding: { - left: 1, - right: 1, - bottom: 1, - }, - width: 80, - borderStyle: "double", - }); + const logBox = boxen(logContent, { + padding: { + left: 1, + right: 1, + bottom: 1, + }, + width: 80, + borderStyle: "double", + }); - const bashCommand = ` + const bashCommand = ` set -e { echo "${logBox}" >> "${logPath}" @@ -139,102 +139,105 @@ Compose Type: ${composeType} ✅`; } `; - return await execAsyncRemote(compose.serverId, bashCommand); + return await execAsyncRemote(compose.serverId, bashCommand); }; const sanitizeCommand = (command: string) => { - const sanitizedCommand = command.trim(); + const sanitizedCommand = command.trim(); - const parts = sanitizedCommand.split(/\s+/); + const parts = sanitizedCommand.split(/\s+/); - const restCommand = parts.map((arg) => arg.replace(/^"(.*)"$/, "$1")); + const restCommand = parts.map((arg) => arg.replace(/^"(.*)"$/, "$1")); - return restCommand.join(" "); + return restCommand.join(" "); }; export const createCommand = (compose: ComposeNested) => { - const { composeType, appName, sourceType } = compose; + const { composeType, appName, sourceType } = compose; - if (compose.command) { - return `${sanitizeCommand(compose.command)}`; - } + if (compose.command) { + return `${sanitizeCommand(compose.command)}`; + } - const path = - sourceType === "raw" ? "docker-compose.yml" : compose.composePath; - let command = ""; + const path = + sourceType === "raw" ? "docker-compose.yml" : compose.composePath; + let command = ""; - if (composeType === "stack") { - command = `stack deploy -c ${path} ${appName} --prune`; - } + if (composeType === "stack") { + command = `stack deploy -c ${path} ${appName} --prune`; + } - return command; + return command; }; const createEnvFile = (compose: ComposeNested) => { - const { COMPOSE_PATH } = paths(); - const { env, composePath, appName } = compose; - const composeFilePath = - join(COMPOSE_PATH, appName, "code", composePath) || - join(COMPOSE_PATH, appName, "code", "docker-compose.yml"); + const { COMPOSE_PATH } = paths(); + const { env, composePath, appName } = compose; + const composeFilePath = + join(COMPOSE_PATH, appName, "code", composePath) || + join(COMPOSE_PATH, appName, "code", "docker-compose.yml"); - const envFilePath = join(dirname(composeFilePath), ".env"); - let envContent = env || ""; - if (!envContent.includes("DOCKER_CONFIG")) { - envContent += "\nDOCKER_CONFIG=/root/.docker/config.json"; - } + const envFilePath = join(dirname(composeFilePath), ".env"); + let envContent = env || ""; + if (!envContent.includes("DOCKER_CONFIG")) { + envContent += "\nDOCKER_CONFIG=/root/.docker/config.json"; + } - if (compose.randomize) { - envContent += `\nCOMPOSE_PREFIX=${compose.suffix}`; - } + if (compose.randomize) { + envContent += `\nCOMPOSE_PREFIX=${compose.suffix}`; + } - const envFileContent = prepareEnvironmentVariables( - envContent, - compose.project.env - ).join("\n"); + const envFileContent = prepareEnvironmentVariables( + envContent, + compose.project.env, + ).join("\n"); - if (!existsSync(dirname(envFilePath))) { - mkdirSync(dirname(envFilePath), { recursive: true }); - } - writeFileSync(envFilePath, envFileContent); + if (!existsSync(dirname(envFilePath))) { + mkdirSync(dirname(envFilePath), { recursive: true }); + } + writeFileSync(envFilePath, envFileContent); }; export const getCreateEnvFileCommand = (compose: ComposeNested) => { - const { COMPOSE_PATH } = paths(true); - const { env, composePath, appName } = compose; - const composeFilePath = - join(COMPOSE_PATH, appName, "code", composePath) || - join(COMPOSE_PATH, appName, "code", "docker-compose.yml"); + const { COMPOSE_PATH } = paths(true); + const { env, composePath, appName } = compose; + const composeFilePath = + join(COMPOSE_PATH, appName, "code", composePath) || + join(COMPOSE_PATH, appName, "code", "docker-compose.yml"); - const envFilePath = join(dirname(composeFilePath), ".env"); + const envFilePath = join(dirname(composeFilePath), ".env"); - let envContent = env || ""; - if (!envContent.includes("DOCKER_CONFIG")) { - envContent += "\nDOCKER_CONFIG=/root/.docker/config.json"; - } + let envContent = env || ""; + if (!envContent.includes("DOCKER_CONFIG")) { + envContent += "\nDOCKER_CONFIG=/root/.docker/config.json"; + } - if (compose.randomize) { - envContent += `\nCOMPOSE_PREFIX=${compose.suffix}`; - } + if (compose.randomize) { + envContent += `\nCOMPOSE_PREFIX=${compose.suffix}`; + } - const envFileContent = prepareEnvironmentVariables( - envContent, - compose.project.env - ).join("\n"); + const envFileContent = prepareEnvironmentVariables( + envContent, + compose.project.env, + ).join("\n"); - const encodedContent = encodeBase64(envFileContent); - return ` + const encodedContent = encodeBase64(envFileContent); + return ` touch ${envFilePath}; echo "${encodedContent}" | base64 -d > "${envFilePath}"; `; }; const getExportEnvCommand = (compose: ComposeNested) => { - if (compose.composeType !== "stack") return ""; - - const envVars = getEnviromentVariablesObject(compose.env, compose.project.env); - const exports = Object.entries(envVars) - .map(([key, value]) => `export ${key}=${JSON.stringify(value)}`) - .join("\n"); - - return exports ? `\n# Export environment variables\n${exports}\n` : ""; + if (compose.composeType !== "stack") return ""; + + const envVars = getEnviromentVariablesObject( + compose.env, + compose.project.env, + ); + const exports = Object.entries(envVars) + .map(([key, value]) => `export ${key}=${JSON.stringify(value)}`) + .join("\n"); + + return exports ? `\n# Export environment variables\n${exports}\n` : ""; }; diff --git a/packages/server/src/utils/docker/utils.ts b/packages/server/src/utils/docker/utils.ts index 96b2e08b..062e0722 100644 --- a/packages/server/src/utils/docker/utils.ts +++ b/packages/server/src/utils/docker/utils.ts @@ -15,529 +15,529 @@ import { spawnAsync } from "../process/spawnAsync"; import { getRemoteDocker } from "../servers/remote-docker"; interface RegistryAuth { - username: string; - password: string; - registryUrl: string; + username: string; + password: string; + registryUrl: string; } export const pullImage = async ( - dockerImage: string, - onData?: (data: any) => void, - authConfig?: Partial + dockerImage: string, + onData?: (data: any) => void, + authConfig?: Partial, ): Promise => { - try { - if (!dockerImage) { - throw new Error("Docker image not found"); - } + try { + if (!dockerImage) { + throw new Error("Docker image not found"); + } - if (authConfig?.username && authConfig?.password) { - await spawnAsync( - "docker", - [ - "login", - authConfig.registryUrl || "", - "-u", - authConfig.username, - "-p", - authConfig.password, - ], - onData - ); - } - await spawnAsync("docker", ["pull", dockerImage], onData); - } catch (error) { - throw error; - } + if (authConfig?.username && authConfig?.password) { + await spawnAsync( + "docker", + [ + "login", + authConfig.registryUrl || "", + "-u", + authConfig.username, + "-p", + authConfig.password, + ], + onData, + ); + } + await spawnAsync("docker", ["pull", dockerImage], onData); + } catch (error) { + throw error; + } }; export const pullRemoteImage = async ( - dockerImage: string, - serverId: string, - onData?: (data: any) => void, - authConfig?: Partial + dockerImage: string, + serverId: string, + onData?: (data: any) => void, + authConfig?: Partial, ): Promise => { - try { - if (!dockerImage) { - throw new Error("Docker image not found"); - } + try { + if (!dockerImage) { + throw new Error("Docker image not found"); + } - const remoteDocker = await getRemoteDocker(serverId); + const remoteDocker = await getRemoteDocker(serverId); - await new Promise((resolve, reject) => { - remoteDocker.pull( - dockerImage, - { authconfig: authConfig }, - (err, stream) => { - if (err) { - reject(err); - return; - } + await new Promise((resolve, reject) => { + remoteDocker.pull( + dockerImage, + { authconfig: authConfig }, + (err, stream) => { + if (err) { + reject(err); + return; + } - remoteDocker.modem.followProgress( - stream as Readable, - (err: Error | null, res) => { - if (!err) { - resolve(res); - } - if (err) { - reject(err); - } - }, - (event) => { - onData?.(event); - } - ); - } - ); - }); - } catch (error) { - throw error; - } + remoteDocker.modem.followProgress( + stream as Readable, + (err: Error | null, res) => { + if (!err) { + resolve(res); + } + if (err) { + reject(err); + } + }, + (event) => { + onData?.(event); + }, + ); + }, + ); + }); + } catch (error) { + throw error; + } }; export const containerExists = async (containerName: string) => { - const container = docker.getContainer(containerName); - try { - await container.inspect(); - return true; - } catch (error) { - return false; - } + const container = docker.getContainer(containerName); + try { + await container.inspect(); + return true; + } catch (error) { + return false; + } }; export const stopService = async (appName: string) => { - try { - await execAsync(`docker service scale ${appName}=0 `); - } catch (error) { - console.error(error); - return error; - } + try { + await execAsync(`docker service scale ${appName}=0 `); + } catch (error) { + console.error(error); + return error; + } }; export const stopServiceRemote = async (serverId: string, appName: string) => { - try { - await execAsyncRemote(serverId, `docker service scale ${appName}=0 `); - } catch (error) { - console.error(error); - return error; - } + try { + await execAsyncRemote(serverId, `docker service scale ${appName}=0 `); + } catch (error) { + console.error(error); + return error; + } }; export const getContainerByName = (name: string): Promise => { - const opts = { - limit: 1, - filters: { - name: [name], - }, - }; - return new Promise((resolve, reject) => { - docker.listContainers(opts, (err, containers) => { - if (err) { - reject(err); - } else if (containers?.length === 0) { - reject(new Error(`No container found with name: ${name}`)); - } else if (containers && containers?.length > 0 && containers[0]) { - resolve(containers[0]); - } - }); - }); + const opts = { + limit: 1, + filters: { + name: [name], + }, + }; + return new Promise((resolve, reject) => { + docker.listContainers(opts, (err, containers) => { + if (err) { + reject(err); + } else if (containers?.length === 0) { + reject(new Error(`No container found with name: ${name}`)); + } else if (containers && containers?.length > 0 && containers[0]) { + resolve(containers[0]); + } + }); + }); }; 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; - } + 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) => { - try { - const command = "docker container prune --force"; - if (serverId) { - await execAsyncRemote(serverId, command); - } else { - await execAsync(command); - } - } catch (error) { - console.error(error); - throw error; - } + try { + const command = "docker container prune --force"; + if (serverId) { + await execAsyncRemote(serverId, command); + } else { + await execAsync(command); + } + } catch (error) { + console.error(error); + throw error; + } }; export const cleanUpUnusedVolumes = async (serverId?: string) => { - try { - const command = "docker volume prune --force"; - if (serverId) { - await execAsyncRemote(serverId, command); - } else { - await execAsync(command); - } - } catch (error) { - console.error(error); - throw error; - } + try { + const command = "docker volume prune --force"; + if (serverId) { + await execAsyncRemote(serverId, command); + } else { + await execAsync(command); + } + } catch (error) { + console.error(error); + throw error; + } }; export const cleanUpInactiveContainers = async () => { - try { - const containers = await docker.listContainers({ all: true }); - const inactiveContainers = containers.filter( - (container) => container.State !== "running" - ); + try { + const containers = await docker.listContainers({ all: true }); + const inactiveContainers = containers.filter( + (container) => container.State !== "running", + ); - for (const container of inactiveContainers) { - await docker.getContainer(container.Id).remove({ force: true }); - console.log(`Cleaning up inactive container: ${container.Id}`); - } - } catch (error) { - console.error("Error cleaning up inactive containers:", error); - throw error; - } + for (const container of inactiveContainers) { + await docker.getContainer(container.Id).remove({ force: true }); + console.log(`Cleaning up inactive container: ${container.Id}`); + } + } catch (error) { + console.error("Error cleaning up inactive containers:", error); + throw error; + } }; export const cleanUpDockerBuilder = async (serverId?: string) => { - const command = "docker builder prune --all --force"; - if (serverId) { - await execAsyncRemote(serverId, command); - } else { - await execAsync(command); - } + const command = "docker builder prune --all --force"; + if (serverId) { + await execAsyncRemote(serverId, command); + } else { + await execAsync(command); + } }; export const cleanUpSystemPrune = async (serverId?: string) => { - const command = "docker system prune --all --force --volumes"; - if (serverId) { - await execAsyncRemote(serverId, command); - } else { - await execAsync(command); - } + const command = "docker system prune --all --force --volumes"; + if (serverId) { + await execAsyncRemote(serverId, command); + } else { + await execAsync(command); + } }; export const startService = async (appName: string) => { - try { - await execAsync(`docker service scale ${appName}=1 `); - } catch (error) { - console.error(error); - throw error; - } + try { + await execAsync(`docker service scale ${appName}=1 `); + } catch (error) { + console.error(error); + throw error; + } }; export const startServiceRemote = async (serverId: string, appName: string) => { - try { - await execAsyncRemote(serverId, `docker service scale ${appName}=1 `); - } catch (error) { - console.error(error); - throw error; - } + try { + await execAsyncRemote(serverId, `docker service scale ${appName}=1 `); + } catch (error) { + console.error(error); + throw error; + } }; export const removeService = async ( - appName: string, - serverId?: string | null, - deleteVolumes = false + appName: string, + serverId?: string | null, + deleteVolumes = false, ) => { - try { - const command = `docker service rm ${appName}`; + try { + const command = `docker service rm ${appName}`; - if (serverId) { - await execAsyncRemote(serverId, command); - } else { - await execAsync(command); - } - } catch (error) { - return error; - } + if (serverId) { + await execAsyncRemote(serverId, command); + } else { + await execAsync(command); + } + } catch (error) { + return error; + } }; export const prepareEnvironmentVariables = ( - serviceEnv: string | null, - projectEnv?: string | null + serviceEnv: string | null, + projectEnv?: string | null, ) => { - const projectVars = parse(projectEnv ?? ""); - const serviceVars = parse(serviceEnv ?? ""); + const projectVars = parse(projectEnv ?? ""); + const serviceVars = parse(serviceEnv ?? ""); - const resolvedVars = Object.entries(serviceVars).map(([key, value]) => { - let resolvedValue = value; - if (projectVars) { - resolvedValue = value.replace(/\$\{\{project\.(.*?)\}\}/g, (_, ref) => { - if (projectVars[ref] !== undefined) { - return projectVars[ref]; - } - throw new Error(`Invalid project environment variable: project.${ref}`); - }); - } - return `${key}=${resolvedValue}`; - }); + const resolvedVars = Object.entries(serviceVars).map(([key, value]) => { + let resolvedValue = value; + if (projectVars) { + resolvedValue = value.replace(/\$\{\{project\.(.*?)\}\}/g, (_, ref) => { + if (projectVars[ref] !== undefined) { + return projectVars[ref]; + } + throw new Error(`Invalid project environment variable: project.${ref}`); + }); + } + return `${key}=${resolvedValue}`; + }); - return resolvedVars; + return resolvedVars; }; export const getEnviromentVariablesObject = ( - input: string | null, - projectEnv?: string | null + input: string | null, + projectEnv?: string | null, ) => { - const envs = prepareEnvironmentVariables(input, projectEnv); + const envs = prepareEnvironmentVariables(input, projectEnv); - const jsonObject: Record = {}; + const jsonObject: Record = {}; - for (const pair of envs) { - const [key, value] = pair.split("="); - if (key && value) { - jsonObject[key] = value; - } - } + for (const pair of envs) { + const [key, value] = pair.split("="); + if (key && value) { + jsonObject[key] = value; + } + } - return jsonObject; + return jsonObject; }; export const generateVolumeMounts = (mounts: ApplicationNested["mounts"]) => { - if (!mounts || mounts.length === 0) { - return []; - } + if (!mounts || mounts.length === 0) { + return []; + } - return mounts - .filter((mount) => mount.type === "volume") - .map((mount) => ({ - Type: "volume" as const, - Source: mount.volumeName || "", - Target: mount.mountPath, - })); + return mounts + .filter((mount) => mount.type === "volume") + .map((mount) => ({ + Type: "volume" as const, + Source: mount.volumeName || "", + Target: mount.mountPath, + })); }; type Resources = { - memoryLimit: string | null; - memoryReservation: string | null; - cpuLimit: string | null; - cpuReservation: string | null; + memoryLimit: string | null; + memoryReservation: string | null; + cpuLimit: string | null; + cpuReservation: string | null; }; export const calculateResources = ({ - memoryLimit, - memoryReservation, - cpuLimit, - cpuReservation, + memoryLimit, + memoryReservation, + cpuLimit, + cpuReservation, }: Resources): ResourceRequirements => { - return { - Limits: { - MemoryBytes: memoryLimit ? Number.parseInt(memoryLimit) : undefined, - NanoCPUs: cpuLimit ? Number.parseInt(cpuLimit) : undefined, - }, - Reservations: { - MemoryBytes: memoryReservation - ? Number.parseInt(memoryReservation) - : undefined, - NanoCPUs: cpuReservation ? Number.parseInt(cpuReservation) : undefined, - }, - }; + return { + Limits: { + MemoryBytes: memoryLimit ? Number.parseInt(memoryLimit) : undefined, + NanoCPUs: cpuLimit ? Number.parseInt(cpuLimit) : undefined, + }, + Reservations: { + MemoryBytes: memoryReservation + ? Number.parseInt(memoryReservation) + : undefined, + NanoCPUs: cpuReservation ? Number.parseInt(cpuReservation) : undefined, + }, + }; }; export const generateConfigContainer = (application: ApplicationNested) => { - const { - healthCheckSwarm, - restartPolicySwarm, - placementSwarm, - updateConfigSwarm, - rollbackConfigSwarm, - modeSwarm, - labelsSwarm, - replicas, - mounts, - networkSwarm, - } = application; + const { + healthCheckSwarm, + restartPolicySwarm, + placementSwarm, + updateConfigSwarm, + rollbackConfigSwarm, + modeSwarm, + labelsSwarm, + replicas, + mounts, + networkSwarm, + } = application; - const haveMounts = mounts.length > 0; + const haveMounts = mounts.length > 0; - return { - ...(healthCheckSwarm && { - HealthCheck: healthCheckSwarm, - }), - ...(restartPolicySwarm - ? { - RestartPolicy: restartPolicySwarm, - } - : {}), - ...(placementSwarm - ? { - Placement: placementSwarm, - } - : { - // if app have mounts keep manager as constraint - Placement: { - Constraints: haveMounts ? ["node.role==manager"] : [], - }, - }), - ...(labelsSwarm && { - Labels: labelsSwarm, - }), - ...(modeSwarm - ? { - Mode: modeSwarm, - } - : { - // use replicas value if no modeSwarm provided - Mode: { - Replicated: { - Replicas: replicas, - }, - }, - }), - ...(rollbackConfigSwarm && { - RollbackConfig: rollbackConfigSwarm, - }), - ...(updateConfigSwarm - ? { UpdateConfig: updateConfigSwarm } - : { - // default config if no updateConfigSwarm provided - UpdateConfig: { - Parallelism: 1, - Order: "start-first", - }, - }), - ...(networkSwarm - ? { - Networks: networkSwarm, - } - : { - Networks: [{ Target: "dokploy-network" }], - }), - }; + return { + ...(healthCheckSwarm && { + HealthCheck: healthCheckSwarm, + }), + ...(restartPolicySwarm + ? { + RestartPolicy: restartPolicySwarm, + } + : {}), + ...(placementSwarm + ? { + Placement: placementSwarm, + } + : { + // if app have mounts keep manager as constraint + Placement: { + Constraints: haveMounts ? ["node.role==manager"] : [], + }, + }), + ...(labelsSwarm && { + Labels: labelsSwarm, + }), + ...(modeSwarm + ? { + Mode: modeSwarm, + } + : { + // use replicas value if no modeSwarm provided + Mode: { + Replicated: { + Replicas: replicas, + }, + }, + }), + ...(rollbackConfigSwarm && { + RollbackConfig: rollbackConfigSwarm, + }), + ...(updateConfigSwarm + ? { UpdateConfig: updateConfigSwarm } + : { + // default config if no updateConfigSwarm provided + UpdateConfig: { + Parallelism: 1, + Order: "start-first", + }, + }), + ...(networkSwarm + ? { + Networks: networkSwarm, + } + : { + Networks: [{ Target: "dokploy-network" }], + }), + }; }; export const generateBindMounts = (mounts: ApplicationNested["mounts"]) => { - if (!mounts || mounts.length === 0) { - return []; - } + if (!mounts || mounts.length === 0) { + return []; + } - return mounts - .filter((mount) => mount.type === "bind") - .map((mount) => ({ - Type: "bind" as const, - Source: mount.hostPath || "", - Target: mount.mountPath, - })); + return mounts + .filter((mount) => mount.type === "bind") + .map((mount) => ({ + Type: "bind" as const, + Source: mount.hostPath || "", + Target: mount.mountPath, + })); }; export const generateFileMounts = ( - appName: string, - service: - | ApplicationNested - | MongoNested - | MariadbNested - | MysqlNested - | PostgresNested - | RedisNested + appName: string, + service: + | ApplicationNested + | MongoNested + | MariadbNested + | MysqlNested + | PostgresNested + | RedisNested, ) => { - const { mounts } = service; - const { APPLICATIONS_PATH } = paths(!!service.serverId); - if (!mounts || mounts.length === 0) { - return []; - } + const { mounts } = service; + const { APPLICATIONS_PATH } = paths(!!service.serverId); + if (!mounts || mounts.length === 0) { + return []; + } - return mounts - .filter((mount) => mount.type === "file") - .map((mount) => { - const fileName = mount.filePath; - const absoluteBasePath = path.resolve(APPLICATIONS_PATH); - const directory = path.join(absoluteBasePath, appName, "files"); - const sourcePath = path.join(directory, fileName || ""); - return { - Type: "bind" as const, - Source: sourcePath, - Target: mount.mountPath, - }; - }); + return mounts + .filter((mount) => mount.type === "file") + .map((mount) => { + const fileName = mount.filePath; + const absoluteBasePath = path.resolve(APPLICATIONS_PATH); + const directory = path.join(absoluteBasePath, appName, "files"); + const sourcePath = path.join(directory, fileName || ""); + return { + Type: "bind" as const, + Source: sourcePath, + Target: mount.mountPath, + }; + }); }; export const createFile = async ( - outputPath: string, - filePath: string, - content: string + outputPath: string, + filePath: string, + content: string, ) => { - try { - const fullPath = path.join(outputPath, filePath); - if (fullPath.endsWith(path.sep) || filePath.endsWith("/")) { - fs.mkdirSync(fullPath, { recursive: true }); - return; - } + try { + const fullPath = path.join(outputPath, filePath); + if (fullPath.endsWith(path.sep) || filePath.endsWith("/")) { + fs.mkdirSync(fullPath, { recursive: true }); + return; + } - const directory = path.dirname(fullPath); - fs.mkdirSync(directory, { recursive: true }); - fs.writeFileSync(fullPath, content || ""); - } catch (error) { - throw error; - } + const directory = path.dirname(fullPath); + fs.mkdirSync(directory, { recursive: true }); + fs.writeFileSync(fullPath, content || ""); + } catch (error) { + throw error; + } }; export const encodeBase64 = (content: string) => - Buffer.from(content, "utf-8").toString("base64"); + Buffer.from(content, "utf-8").toString("base64"); export const getCreateFileCommand = ( - outputPath: string, - filePath: string, - content: string + outputPath: string, + filePath: string, + content: string, ) => { - const fullPath = path.join(outputPath, filePath); - if (fullPath.endsWith(path.sep) || filePath.endsWith("/")) { - return `mkdir -p ${fullPath};`; - } + const fullPath = path.join(outputPath, filePath); + if (fullPath.endsWith(path.sep) || filePath.endsWith("/")) { + return `mkdir -p ${fullPath};`; + } - const directory = path.dirname(fullPath); - const encodedContent = encodeBase64(content); - return ` + const directory = path.dirname(fullPath); + const encodedContent = encodeBase64(content); + return ` mkdir -p ${directory}; echo "${encodedContent}" | base64 -d > "${fullPath}"; `; }; export const getServiceContainer = async (appName: string) => { - try { - const filter = { - status: ["running"], - label: [`com.docker.swarm.service.name=${appName}`], - }; + try { + const filter = { + status: ["running"], + label: [`com.docker.swarm.service.name=${appName}`], + }; - const containers = await docker.listContainers({ - filters: JSON.stringify(filter), - }); + const containers = await docker.listContainers({ + filters: JSON.stringify(filter), + }); - if (containers.length === 0 || !containers[0]) { - throw new Error(`No container found with name: ${appName}`); - } + if (containers.length === 0 || !containers[0]) { + throw new Error(`No container found with name: ${appName}`); + } - const container = containers[0]; + const container = containers[0]; - return container; - } catch (error) { - throw error; - } + return container; + } catch (error) { + throw error; + } }; export const getRemoteServiceContainer = async ( - serverId: string, - appName: string + serverId: string, + appName: string, ) => { - try { - const filter = { - status: ["running"], - label: [`com.docker.swarm.service.name=${appName}`], - }; - const remoteDocker = await getRemoteDocker(serverId); - const containers = await remoteDocker.listContainers({ - filters: JSON.stringify(filter), - }); + try { + const filter = { + status: ["running"], + label: [`com.docker.swarm.service.name=${appName}`], + }; + const remoteDocker = await getRemoteDocker(serverId); + const containers = await remoteDocker.listContainers({ + filters: JSON.stringify(filter), + }); - if (containers.length === 0 || !containers[0]) { - throw new Error(`No container found with name: ${appName}`); - } + if (containers.length === 0 || !containers[0]) { + throw new Error(`No container found with name: ${appName}`); + } - const container = containers[0]; + const container = containers[0]; - return container; - } catch (error) { - throw error; - } + return container; + } catch (error) { + throw error; + } };