Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy.git synced 2026-06-15 20:25:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3030 from AlexTMjugador/fix/compose-domains

Browse Source 
fix: ensure Compose Traefik domain labels are written to local daemons
This commit is contained in:
Mauricio Siu
2025-11-19 02:33:46 -06:00
committed by GitHub
parent 9e2788e764 3a17c9b9e8
commit f53e1a6543
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@ 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 { writeDomainsToComposeRemote } from "../docker/domain";
import { writeDomainsToCompose } from "../docker/domain";
import {
encodeBase64,
getEnviromentVariablesObject,
@@ -22,7 +22,7 @@ export const getBuildComposeCommand = async (compose: ComposeNested) => {
const projectPath = join(COMPOSE_PATH, compose.appName, "code");
const exportEnvCommand = getExportEnvCommand(compose);
const newCompose = await writeDomainsToComposeRemote(compose, domains);
const newCompose = await writeDomainsToCompose(compose, domains);
const logContent = `
App Name: ${appName}
Build Compose 🐳

15
packages/server/src/utils/docker/domain.ts
View File

@@ -102,7 +102,7 @@ export const readComposeFile = async (compose: Compose) => {
return null;
};
export const writeDomainsToComposeRemote = async (
export const writeDomainsToCompose = async (
compose: Compose,
domains: Domain[],
) => {
@@ -120,19 +120,16 @@ echo "❌ Error: Compose file not found";
exit 1;
`;
}
if (compose.serverId) {
const composeString = stringify(composeConverted, { lineWidth: 1000 });
const encodedContent = encodeBase64(composeString);
return `echo "${encodedContent}" | base64 -d > "${path}";`;
}
const composeString = stringify(composeConverted, { lineWidth: 1000 });
const encodedContent = encodeBase64(composeString);
return `echo "${encodedContent}" | base64 -d > "${path}";`;
} catch (error) {
// @ts-ignore
return `echo "❌ Has occured an error: ${error?.message || error}";
return `echo "❌ Has occurred an error: ${error?.message || error}";
exit 1;
`;
}
return "";
};
export const addDomainToCompose = async (
compose: Compose,