Skip to content

Commit 2a7807c

Browse files
authored
Merge pull request #3062 from Dokploy/3061-dokploy-instance-env-variables-override-compose-env
fix: update Docker command execution to use a clean environment
2 parents 96dff0c + 425b8ec commit 2a7807c

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

packages/server/src/services/compose.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ export const removeCompose = async (
375375
} else {
376376
const command = `
377377
docker network disconnect ${compose.appName} dokploy-traefik;
378-
cd ${projectPath} && docker compose -p ${compose.appName} down ${
378+
cd ${projectPath} && env -i PATH="$PATH" docker compose -p ${compose.appName} down ${
379379
deleteVolumes ? "--volumes" : ""
380380
} && rm -rf ${projectPath}`;
381381

@@ -402,7 +402,7 @@ export const startCompose = async (composeId: string) => {
402402
const projectPath = join(COMPOSE_PATH, compose.appName, "code");
403403
const path =
404404
compose.sourceType === "raw" ? "docker-compose.yml" : compose.composePath;
405-
const baseCommand = `docker compose -p ${compose.appName} -f ${path} up -d`;
405+
const baseCommand = `env -i PATH="$PATH" docker compose -p ${compose.appName} -f ${path} up -d`;
406406
if (compose.composeType === "docker-compose") {
407407
if (compose.serverId) {
408408
await execAsyncRemote(
@@ -437,14 +437,17 @@ export const stopCompose = async (composeId: string) => {
437437
if (compose.serverId) {
438438
await execAsyncRemote(
439439
compose.serverId,
440-
`cd ${join(COMPOSE_PATH, compose.appName)} && docker compose -p ${
440+
`cd ${join(COMPOSE_PATH, compose.appName)} && env -i PATH="$PATH" docker compose -p ${
441441
compose.appName
442442
} stop`,
443443
);
444444
} else {
445-
await execAsync(`docker compose -p ${compose.appName} stop`, {
446-
cwd: join(COMPOSE_PATH, compose.appName),
447-
});
445+
await execAsync(
446+
`env -i PATH="$PATH" docker compose -p ${compose.appName} stop`,
447+
{
448+
cwd: join(COMPOSE_PATH, compose.appName),
449+
},
450+
);
448451
}
449452
}
450453

packages/server/src/utils/builders/compose.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Compose Type: ${composeType} ✅`;
5454
5555
${exportEnvCommand}
5656
${compose.isolatedDeployment ? `docker network inspect ${compose.appName} >/dev/null 2>&1 || docker network create --attachable ${compose.appName}` : ""}
57-
docker ${command.split(" ").join(" ")} 2>&1 || { echo "Error: ❌ Docker command failed"; exit 1; }
57+
env -i PATH="$PATH" docker ${command.split(" ").join(" ")} 2>&1 || { echo "Error: ❌ Docker command failed"; exit 1; }
5858
${compose.isolatedDeployment ? `docker network connect ${compose.appName} $(docker ps --filter "name=dokploy-traefik" -q) >/dev/null 2>&1` : ""}
5959
6060
echo "Docker Compose Deployed: ✅";

0 commit comments

Comments
 (0)