andwati/dokploy
1
0
Fork 0
mirror of https://github.com/andwati/dokploy.git synced 2026-11-13 07:25:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3062 from Dokploy/3061-dokploy-instance-env-variables-override-compose-env

Browse Source 
fix: update Docker command execution to use a clean environment
This commit is contained in:
Mauricio Siu
2025-11-19 10:00:58 -06:00
committed by GitHub
parent 96dff0c1bb 425b8ec3c2
commit 2a7807c2b3
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/server/src/services/compose.ts
+9 -6
View File
@@ -375,7 +375,7 @@ export const removeCompose = async (
} else { } else {
const command = ` const command = `
docker network disconnect ${compose.appName} dokploy-traefik; docker network disconnect ${compose.appName} dokploy-traefik;
cd ${projectPath} && docker compose -p ${compose.appName} down ${ cd ${projectPath} && env -i PATH="$PATH" docker compose -p ${compose.appName} down ${
deleteVolumes ? "--volumes" : "" deleteVolumes ? "--volumes" : ""
} && rm -rf ${projectPath}`; } && rm -rf ${projectPath}`;
@@ -402,7 +402,7 @@ export const startCompose = async (composeId: string) => {
const projectPath = join(COMPOSE_PATH, compose.appName, "code"); const projectPath = join(COMPOSE_PATH, compose.appName, "code");
const path = const path =
compose.sourceType === "raw" ? "docker-compose.yml" : compose.composePath; compose.sourceType === "raw" ? "docker-compose.yml" : compose.composePath;
const baseCommand = `docker compose -p ${compose.appName} -f ${path} up -d`; const baseCommand = `env -i PATH="$PATH" docker compose -p ${compose.appName} -f ${path} up -d`;
if (compose.composeType === "docker-compose") { if (compose.composeType === "docker-compose") {
if (compose.serverId) { if (compose.serverId) {
await execAsyncRemote( await execAsyncRemote(
@@ -437,14 +437,17 @@ export const stopCompose = async (composeId: string) => {
if (compose.serverId) { if (compose.serverId) {
await execAsyncRemote( await execAsyncRemote(
compose.serverId, compose.serverId,
`cd ${join(COMPOSE_PATH, compose.appName)} && docker compose -p ${ `cd ${join(COMPOSE_PATH, compose.appName)} && env -i PATH="$PATH" docker compose -p ${
compose.appName compose.appName
} stop`, } stop`,
); );
} else { } else {
await execAsync(`docker compose -p ${compose.appName} stop`, { await execAsync(
cwd: join(COMPOSE_PATH, compose.appName), `env -i PATH="$PATH" docker compose -p ${compose.appName} stop`,
}); {
cwd: join(COMPOSE_PATH, compose.appName),
},
);
} }
} }
packages/server/src/utils/builders/compose.ts
+1 -1
View File
@@ -54,7 +54,7 @@ Compose Type: ${composeType} ✅`;
${exportEnvCommand} ${exportEnvCommand}
${compose.isolatedDeployment ? `docker network inspect ${compose.appName} >/dev/null 2>&1 || docker network create --attachable ${compose.appName}` : ""} ${compose.isolatedDeployment ? `docker network inspect ${compose.appName} >/dev/null 2>&1 || docker network create --attachable ${compose.appName}` : ""}
docker ${command.split(" ").join(" ")} 2>&1 || { echo "Error: ❌ Docker command failed"; exit 1; } env -i PATH="$PATH" docker ${command.split(" ").join(" ")} 2>&1 || { echo "Error: ❌ Docker command failed"; exit 1; }
${compose.isolatedDeployment ? `docker network connect ${compose.appName} $(docker ps --filter "name=dokploy-traefik" -q) >/dev/null 2>&1` : ""} ${compose.isolatedDeployment ? `docker network connect ${compose.appName} $(docker ps --filter "name=dokploy-traefik" -q) >/dev/null 2>&1` : ""}
echo "Docker Compose Deployed: ✅"; echo "Docker Compose Deployed: ✅";