mirror of
https://github.com/LukeHagar/dokploy.git
synced 2025-12-09 20:37:45 +00:00
Merge pull request #2290 from Dokploy/2277-two-copies-of-the-same-volume-backup-are-uploaded-to-s3
refactor(backup): consolidate utility imports and add local backup cl…
This commit is contained in:
@@ -2,8 +2,7 @@ import path from "node:path";
|
|||||||
import { paths } from "@dokploy/server/constants";
|
import { paths } from "@dokploy/server/constants";
|
||||||
import { findComposeById } from "@dokploy/server/services/compose";
|
import { findComposeById } from "@dokploy/server/services/compose";
|
||||||
import type { findVolumeBackupById } from "@dokploy/server/services/volume-backups";
|
import type { findVolumeBackupById } from "@dokploy/server/services/volume-backups";
|
||||||
import { normalizeS3Path } from "../backups/utils";
|
import { getS3Credentials, normalizeS3Path } from "../backups/utils";
|
||||||
import { getS3Credentials } from "../backups/utils";
|
|
||||||
|
|
||||||
export const backupVolume = async (
|
export const backupVolume = async (
|
||||||
volumeBackup: Awaited<ReturnType<typeof findVolumeBackupById>>,
|
volumeBackup: Awaited<ReturnType<typeof findVolumeBackupById>>,
|
||||||
@@ -37,6 +36,9 @@ export const backupVolume = async (
|
|||||||
echo "Starting upload to S3..."
|
echo "Starting upload to S3..."
|
||||||
${rcloneCommand}
|
${rcloneCommand}
|
||||||
echo "Upload to S3 done ✅"
|
echo "Upload to S3 done ✅"
|
||||||
|
echo "Cleaning up local backup file..."
|
||||||
|
rm "${volumeBackupPath}/${backupFileName}"
|
||||||
|
echo "Local backup file cleaned up ✅"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
if (!turnOff) {
|
if (!turnOff) {
|
||||||
|
|||||||
Reference in New Issue
Block a user