From 2f37235aeaa5f6dc998d5bd628466e76d3286e51 Mon Sep 17 00:00:00 2001
From: EL OUAZIZI Walid <156519881+WalidDevIO@users.noreply.github.com>
Date: Sun, 15 Mar 2026 06:46:33 +0100
Subject: [PATCH 1/3] fix(volume-backups): restart container before S3 upload
 in volume backup

---
 .../server/src/utils/volume-backups/backup.ts   | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/utils/volume-backups/backup.ts b/packages/server/src/utils/volume-backups/backup.ts
index e192fd698..68007f907 100644
--- a/packages/server/src/utils/volume-backups/backup.ts
+++ b/packages/server/src/utils/volume-backups/backup.ts
@@ -39,7 +39,7 @@ export const backupVolume = async (
 
 	const rcloneCommand = `rclone copyto ${rcloneFlags.join(" ")} "${volumeBackupPath}/${backupFileName}" "${rcloneDestination}"`;
 
-	const baseCommand = `
+	const backupCommand = `
 	set -e
 	echo "Volume name: ${volumeName}"
 	echo "Backup file name: ${backupFileName}"
@@ -52,6 +52,10 @@ export const backupVolume = async (
   ubuntu \
   bash -c "cd /volume_data && tar cvf /backup/${backupFileName} ."
   echo "Volume backup done ✅"
+  `;
+
+  const uploadCommand = `
+  set -e
   echo "Starting upload to S3..."
   ${rcloneCommand}
   echo "Upload to S3 done ✅"
@@ -61,7 +65,10 @@ export const backupVolume = async (
   `;
 
 	if (!turnOff) {
-		return baseCommand;
+		return `
+		${backupCommand}
+		${uploadCommand}
+		`;
 	}
 
 	const serviceLockId =
@@ -110,9 +117,10 @@ export const backupVolume = async (
 		ACTUAL_REPLICAS=$(docker service inspect ${volumeBackup.application?.appName} --format "{{.Spec.Mode.Replicated.Replicas}}")
 		echo "Actual replicas: $ACTUAL_REPLICAS"
 		docker service update --replicas=0 ${volumeBackup.application?.appName}
-        ${baseCommand}
+        ${backupCommand}
 		echo "Starting application to $ACTUAL_REPLICAS replicas"
         docker service update --replicas=$ACTUAL_REPLICAS --with-registry-auth ${volumeBackup.application?.appName}
+		${uploadCommand}
   `);
 	}
 	if (serviceType === "compose") {
@@ -147,8 +155,9 @@ export const backupVolume = async (
 		}
 		return lockWrapper(`
         ${stopCommand}
-        ${baseCommand}
+        ${backupCommand}
         ${startCommand}
+		${uploadCommand}
   `);
 	}
 };

From b9ac720d99660907b892b6371c9b1d655f5ec973 Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Tue, 17 Mar 2026 06:25:03 +0000
Subject: [PATCH 2/3] [autofix.ci] apply automated fixes

---
 packages/server/src/utils/volume-backups/backup.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/utils/volume-backups/backup.ts b/packages/server/src/utils/volume-backups/backup.ts
index 68007f907..2e1a3bd64 100644
--- a/packages/server/src/utils/volume-backups/backup.ts
+++ b/packages/server/src/utils/volume-backups/backup.ts
@@ -54,7 +54,7 @@ export const backupVolume = async (
   echo "Volume backup done ✅"
   `;
 
-  const uploadCommand = `
+	const uploadCommand = `
   set -e
   echo "Starting upload to S3..."
   ${rcloneCommand}

From 11aa8fe0c55137c09e7ac806c6156b35b2e31cac Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Tue, 17 Mar 2026 08:51:31 -0600
Subject: [PATCH 3/3] Update packages/server/src/utils/volume-backups/backup.ts

---
 packages/server/src/utils/volume-backups/backup.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/server/src/utils/volume-backups/backup.ts b/packages/server/src/utils/volume-backups/backup.ts
index 2e1a3bd64..79c49c81a 100644
--- a/packages/server/src/utils/volume-backups/backup.ts
+++ b/packages/server/src/utils/volume-backups/backup.ts
@@ -55,7 +55,6 @@ export const backupVolume = async (
   `;
 
 	const uploadCommand = `
-  set -e
   echo "Starting upload to S3..."
   ${rcloneCommand}
   echo "Upload to S3 done ✅"