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

refactor: used docker stack config

Browse Source
This commit is contained in:
xenonwellz
2024-11-02 00:35:38 +01:00
parent dc1e12d6ed
commit 06081627e8
1 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@ import {
writeDomainsToComposeRemote, writeDomainsToComposeRemote,
} from "../docker/domain"; } from "../docker/domain";
import { encodeBase64, prepareEnvironmentVariables } from "../docker/utils"; import { encodeBase64, prepareEnvironmentVariables } from "../docker/utils";
import { execAsyncRemote } from "../process/execAsync"; import { execAsync, execAsyncRemote } from "../process/execAsync";
import { spawnAsync } from "../process/spawnAsync"; import { spawnAsync } from "../process/spawnAsync";
export type ComposeNested = InferResultType< export type ComposeNested = InferResultType<
@@ -30,7 +30,7 @@ export const buildCompose = async (compose: ComposeNested, logPath: string) => {
const command = createCommand(compose); const command = createCommand(compose);
await writeDomainsToCompose(compose, domains); await writeDomainsToCompose(compose, domains);
createEnvFile(compose); createEnvFile(compose);
processComposeFile(compose); await processComposeFile(compose);
const logContent = ` const logContent = `
App Name: ${appName} App Name: ${appName}
@@ -194,44 +194,34 @@ const createEnvFile = (compose: ComposeNested) => {
writeFileSync(envFilePath, envFileContent); writeFileSync(envFilePath, envFileContent);
}; };
export const processComposeFile = (compose: ComposeNested) => { export const processComposeFile = async (compose: ComposeNested) => {
const { COMPOSE_PATH } = paths(); const { COMPOSE_PATH } = paths();
const { env, appName, sourceType, composeType } = compose; let command = getProcessComposeFileCommand(compose);
const inputPath = if (compose.serverId) {
sourceType === "raw" ? "docker-compose.yml" : compose.composePath; command = `cd ${join(COMPOSE_PATH, compose.appName, "code")} && ${command}`;
const composeInputFilePath = await execAsyncRemote(compose.serverId, command);
join(COMPOSE_PATH, appName, "code", inputPath) || } else {
join(COMPOSE_PATH, appName, "code", "docker-compose.yml"); await execAsync(command, {
cwd: join(COMPOSE_PATH, compose.appName, "code"),
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] || "";
},
);
} }
writeFileSync(composeOutputFilePath, templateContent);
}; };
export const getProcessComposeFileCommand = (compose: ComposeNested) => { export const getProcessComposeFileCommand = (compose: ComposeNested) => {
const { composeType } = compose; const { composeType } = compose;
let command = "";
if (composeType === "stack") { 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) => { export const getCreateEnvFileCommand = (compose: ComposeNested) => {