From 7a0ff72f5146ea20140cef141a009da861aa9462 Mon Sep 17 00:00:00 2001 From: Mauricio Siu Date: Thu, 20 Nov 2025 08:43:24 -0600 Subject: [PATCH 1/2] fix: improve Docker command execution by including environment variable exports - Updated the Docker command execution to include environment variable exports directly in the command, enhancing the handling of environment variables during deployment. - Simplified the export command structure for better readability and efficiency. Fix https://github.com/Dokploy/dokploy/pull/3066#issuecomment-3558022350 --- packages/server/src/utils/builders/compose.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/server/src/utils/builders/compose.ts b/packages/server/src/utils/builders/compose.ts index d196cef04..fe5417ea5 100644 --- a/packages/server/src/utils/builders/compose.ts +++ b/packages/server/src/utils/builders/compose.ts @@ -53,9 +53,8 @@ Compose Type: ${composeType} ✅`; cd "${projectPath}"; - ${exportEnvCommand} ${compose.isolatedDeployment ? `docker network inspect ${compose.appName} >/dev/null 2>&1 || docker network create --attachable ${compose.appName}` : ""} - env -i PATH="$PATH" docker ${command.split(" ").join(" ")} 2>&1 || { echo "Error: ❌ Docker command failed"; exit 1; } + env -i PATH="$PATH" ${exportEnvCommand} 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` : ""} echo "Docker Compose Deployed: ✅"; @@ -66,7 +65,6 @@ Compose Type: ${composeType} ✅`; `; return bashCommand; - // return await execAsyncRemote(compose.serverId, bashCommand); }; const sanitizeCommand = (command: string) => { @@ -138,8 +136,8 @@ const getExportEnvCommand = (compose: ComposeNested) => { compose.environment.project.env, ); const exports = Object.entries(envVars) - .map(([key, value]) => `export ${key}=${quote([value])}`) - .join("\n"); + .map(([key, value]) => `${key}=${quote([value])}`) + .join(" "); - return exports ? `\n# Export environment variables\n${exports}\n` : ""; + return exports ? `${exports}` : ""; }; From ad0e044740a9a89c20289ed3292be88831605fb1 Mon Sep 17 00:00:00 2001 From: Mauricio Siu Date: Thu, 20 Nov 2025 08:48:33 -0600 Subject: [PATCH 2/2] chore: bump version to v0.25.10 in package.json --- apps/dokploy/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json index 9f2229937..e52968b15 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -1,6 +1,6 @@ { "name": "dokploy", - "version": "v0.25.9", + "version": "v0.25.10", "private": true, "license": "Apache-2.0", "type": "module",