From 8e8bc3e71e3c836dce085bc370be933b47bf570f Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Thu, 17 Apr 2025 01:58:25 -0600
Subject: [PATCH] Enhance PostgreSQL backup command in web server utility

- Added error handling to check for the existence of the PostgreSQL container before executing the backup command.
- Updated the backup command to use the retrieved container ID, ensuring the command runs correctly.
---
 packages/server/src/utils/backups/web-server.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/utils/backups/web-server.ts b/packages/server/src/utils/backups/web-server.ts
index a7d48a2f..ef2249d0 100644
--- a/packages/server/src/utils/backups/web-server.ts
+++ b/packages/server/src/utils/backups/web-server.ts
@@ -23,7 +23,17 @@ export const runWebServerBackup = async (backup: BackupSchedule) => {
 		try {
 			await execAsync(`mkdir -p ${tempDir}/filesystem`);
 
-			const postgresCommand = `docker exec $(docker ps --filter "name=dokploy-postgres" -q) pg_dump -v -Fc -U dokploy -d dokploy > ${tempDir}/database.sql`;
+			// First get the container ID
+			const { stdout: containerId } = await execAsync(
+				"docker ps --filter 'name=dokploy-postgres' -q",
+			);
+
+			if (!containerId) {
+				throw new Error("PostgreSQL container not found");
+			}
+
+			// Then run pg_dump with the container ID
+			const postgresCommand = `docker exec ${containerId.trim()} pg_dump -v -Fc -U dokploy -d dokploy > '${tempDir}/database.sql'`;
 			await execAsync(postgresCommand);
 
 			await execAsync(`cp -r ${BASE_PATH}/* ${tempDir}/filesystem/`);