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

Refactor restoreWebServerBackup function: implement temporary directory creation outside BASE_PATH, streamline filesystem restoration process, and enhance logging for database restore operations.

Browse Source
This commit is contained in:
Mauricio Siu
2025-03-29 19:47:02 -06:00
parent 297439a348
commit ffc2d593e4
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
packages/server/src/utils/restore/web-server.ts
View File

@@ -2,6 +2,9 @@ import type { Destination } from "@dokploy/server/services/destination";
import { getS3Credentials } from "../backups/utils"; import { getS3Credentials } from "../backups/utils";
import { execAsync } from "../process/execAsync"; import { execAsync } from "../process/execAsync";
import { paths } from "@dokploy/server"; import { paths } from "@dokploy/server";
import { mkdtemp } from "node:fs/promises";
import { join } from "node:path";
import { tmpdir } from "node:os";
export const restoreWebServerBackup = async ( export const restoreWebServerBackup = async (
destination: Destination, destination: Destination,
@@ -13,7 +16,9 @@ export const restoreWebServerBackup = async (
const bucketPath = `:s3:${destination.bucket}`; const bucketPath = `:s3:${destination.bucket}`;
const backupPath = `${bucketPath}/${backupFile}`; const backupPath = `${bucketPath}/${backupFile}`;
const { BASE_PATH } = paths(); const { BASE_PATH } = paths();
const tempDir = `${BASE_PATH}/temp-restore-${new Date().toISOString().replace(/[:.]/g, "-")}`;
// Create a temporary directory outside of BASE_PATH
const tempDir = await mkdtemp(join(tmpdir(), "dokploy-restore-"));
try { try {
emit("Starting restore..."); emit("Starting restore...");
@@ -39,6 +44,25 @@ export const restoreWebServerBackup = async (
emit("Extracting backup..."); emit("Extracting backup...");
await execAsync(`cd ${tempDir} && unzip ${backupFile}`); await execAsync(`cd ${tempDir} && unzip ${backupFile}`);
// Restore filesystem first
emit("Restoring filesystem...");
emit(`Copying from ${tempDir}/filesystem/* to ${BASE_PATH}/`);
// First clean the target directory
emit("Cleaning target directory...");
await execAsync(`rm -rf "${BASE_PATH}/"*`);
// Ensure the target directory exists
emit("Setting up target directory...");
await execAsync(`mkdir -p "${BASE_PATH}"`);
// Copy files preserving permissions
emit("Copying files...");
await execAsync(`cp -rp "${tempDir}/filesystem/"* "${BASE_PATH}/"`);
// Now handle database restore
emit("Starting database restore...");
// Check if database.sql.gz exists and decompress it // Check if database.sql.gz exists and decompress it
const { stdout: hasGzFile } = await execAsync( const { stdout: hasGzFile } = await execAsync(
`ls ${tempDir}/database.sql.gz || true`, `ls ${tempDir}/database.sql.gz || true`,
@@ -56,9 +80,6 @@ export const restoreWebServerBackup = async (
throw new Error("Database file not found after extraction"); throw new Error("Database file not found after extraction");
} }
// Restore database
emit("Restoring database...");
// Drop and recreate database // Drop and recreate database
emit("Disconnecting all users from database..."); emit("Disconnecting all users from database...");
await execAsync( await execAsync(
@@ -99,10 +120,6 @@ export const restoreWebServerBackup = async (
`docker exec $(docker ps --filter "name=dokploy-postgres" -q) rm /tmp/database.sql`, `docker exec $(docker ps --filter "name=dokploy-postgres" -q) rm /tmp/database.sql`,
); );
// Restore filesystem
emit("Restoring filesystem...");
await execAsync(`cp -r ${tempDir}/filesystem/* ${BASE_PATH}/`);
emit("Restore completed successfully!"); emit("Restore completed successfully!");
} finally { } finally {
// Cleanup // Cleanup