mirror of
https://github.com/andwati/dokploy.git
synced 2026-11-17 17:35:17 +00:00
refactor: enhance volume backup path handling to ensure proper prefix usage
This commit is contained in:
@@ -13,7 +13,10 @@ export const backupVolume = async (
|
|||||||
const { VOLUME_BACKUPS_PATH, VOLUME_BACKUP_LOCK_PATH } = paths(!!serverId);
|
const { VOLUME_BACKUPS_PATH, VOLUME_BACKUP_LOCK_PATH } = paths(!!serverId);
|
||||||
const destination = volumeBackup.destination;
|
const destination = volumeBackup.destination;
|
||||||
const backupFileName = `${volumeName}-${new Date().toISOString()}.tar`;
|
const backupFileName = `${volumeName}-${new Date().toISOString()}.tar`;
|
||||||
const bucketDestination = `${normalizeS3Path(prefix)}${backupFileName}`;
|
const effectivePrefix = prefix
|
||||||
|
? normalizeS3Path(prefix)
|
||||||
|
: `${volumeBackup.appName}/`;
|
||||||
|
const bucketDestination = `${effectivePrefix}${backupFileName}`;
|
||||||
const rcloneFlags = getS3Credentials(volumeBackup.destination);
|
const rcloneFlags = getS3Credentials(volumeBackup.destination);
|
||||||
const rcloneDestination = `:s3:${destination.bucket}/${bucketDestination}`;
|
const rcloneDestination = `:s3:${destination.bucket}/${bucketDestination}`;
|
||||||
const volumeBackupPath = path.join(VOLUME_BACKUPS_PATH, volumeBackup.appName);
|
const volumeBackupPath = path.join(VOLUME_BACKUPS_PATH, volumeBackup.appName);
|
||||||
|
|||||||
@@ -81,7 +81,9 @@ const cleanupOldVolumeBackups = async (
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const rcloneFlags = getS3Credentials(destination);
|
const rcloneFlags = getS3Credentials(destination);
|
||||||
const normalizedPrefix = normalizeS3Path(prefix);
|
const normalizedPrefix = prefix
|
||||||
|
? normalizeS3Path(prefix)
|
||||||
|
: `${volumeBackup.appName}/`;
|
||||||
const backupFilesPath = `:s3:${destination.bucket}/${normalizedPrefix}`;
|
const backupFilesPath = `:s3:${destination.bucket}/${normalizedPrefix}`;
|
||||||
const listCommand = `rclone lsf ${rcloneFlags.join(" ")} --include \"${volumeName}-*.tar\" :s3:${destination.bucket}/${normalizedPrefix}`;
|
const listCommand = `rclone lsf ${rcloneFlags.join(" ")} --include \"${volumeName}-*.tar\" :s3:${destination.bucket}/${normalizedPrefix}`;
|
||||||
const sortAndPick = `sort -r | tail -n +$((${keepLatestCount}+1)) | xargs -I{}`;
|
const sortAndPick = `sort -r | tail -n +$((${keepLatestCount}+1)) | xargs -I{}`;
|
||||||
|
|||||||
Reference in New Issue
Block a user