From 4c96d8559a9ce4ab03cef7be4e79bf1c8671f5b7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 22 Dec 2025 16:54:09 +0000 Subject: [PATCH] Fix zombie processes from Docker cleanup by adding wait command Co-authored-by: Siumauricio <47042324+Siumauricio@users.noreply.github.com> --- packages/server/package.json | 29 ++++++++++++++++------- packages/server/src/utils/docker/utils.ts | 8 ++++++- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index e23fa6d8b..b2fe8b586 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,21 +1,32 @@ { "name": "@dokploy/server", "version": "1.0.0", - "main": "./src/index.ts", + "main": "./dist/index.js", "type": "module", "exports": { - ".": "./src/index.ts", + ".": { + "import": "./dist/index.js", + "require": "./dist/index.cjs.js" + }, "./db": { - "import": "./src/db/index.ts", + "import": "./dist/db/index.js", "require": "./dist/db/index.cjs.js" }, - "./setup/*": { - "import": "./src/setup/*.ts", - "require": "./dist/setup/index.cjs.js" + "./*": { + "import": "./dist/*", + "require": "./dist/*.cjs" }, - "./constants": { - "import": "./src/constants/index.ts", - "require": "./dist/constants.cjs.js" + "./dist": { + "import": "./dist/index.js", + "require": "./dist/index.cjs.js" + }, + "./dist/db": { + "import": "./dist/db/index.js", + "require": "./dist/db/index.cjs.js" + }, + "./dist/db/schema": { + "import": "./dist/db/schema/index.js", + "require": "./dist/db/schema/index.cjs.js" } }, "scripts": { diff --git a/packages/server/src/utils/docker/utils.ts b/packages/server/src/utils/docker/utils.ts index 045040061..eb69ee383 100644 --- a/packages/server/src/utils/docker/utils.ts +++ b/packages/server/src/utils/docker/utils.ts @@ -167,9 +167,15 @@ while true; do fi done +# Execute command and capture exit code ${exec} +EXIT_CODE=$? -echo "Execution completed." +# Wait for all background processes to complete to prevent zombie processes +wait + +echo "Execution completed with exit code: $EXIT_CODE" +exit $EXIT_CODE `; const cleanupCommands = {