Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(backup): handle multiple container IDs in backup command

Browse Source 
Ensure only one container ID is used when running `docker exec` for pg_dump to avoid errors caused by multiple matching containers.

Fixes INTERNAL_SERVER_ERROR from backup.manualBackupWebServer path.

Co-authored-by: Merloss 54235902+Merloss@users.noreply.github.com
This commit is contained in:
Barış DEMİRCİ 2025-04-20 12:14:41 +00:00
parent da60c4f3a8
commit 8d28a50a17
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/server/src/utils/backups/web-server.ts
View File

@ -24,6 +24,7 @@ export const runWebServerBackup = async (backup: BackupSchedule) => {
await execAsync(`mkdir -p ${tempDir}/filesystem`);
// First get the container ID
// Returns: ID\nID\nID...
const { stdout: containerId } = await execAsync(
"docker ps --filter 'name=dokploy-postgres' -q",
);
@ -32,14 +33,20 @@ export const runWebServerBackup = async (backup: BackupSchedule) => {
throw new Error("PostgreSQL container not found");
}
// ID\nID\nID... => [ "ID", "ID", ... ]
const containers = containerId.trim().split("\n").filter(Boolean);
// 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);
for (const containerId of containers) {
// Maybe we can find a better identification for this part vvv
const postgresCommand = `docker exec ${containerId.trim()} pg_dump -v -Fc -U dokploy -d dokploy > '${tempDir}/database-${containerId}.sql'`;
await execAsync(postgresCommand);
}
await execAsync(`cp -r ${BASE_PATH}/* ${tempDir}/filesystem/`);
await execAsync(
`cd ${tempDir} && zip -r ${backupFileName} database.sql filesystem/ > /dev/null 2>&1`,
await execAsync( // Zip all .sql files since we created more than one
`cd ${tempDir} && zip -r ${backupFileName} *.sql filesystem/ > /dev/null 2>&1`,
);
const uploadCommand = `rclone copyto ${rcloneFlags.join(" ")} "${tempDir}/${backupFileName}" "${s3Path}"`;