diff --git a/packages/server/src/utils/volume-backups/backup.ts b/packages/server/src/utils/volume-backups/backup.ts index e192fd698..79c49c81a 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,9 @@ export const backupVolume = async ( ubuntu \ bash -c "cd /volume_data && tar cvf /backup/${backupFileName} ." echo "Volume backup done ✅" + `; + + const uploadCommand = ` echo "Starting upload to S3..." ${rcloneCommand} echo "Upload to S3 done ✅" @@ -61,7 +64,10 @@ export const backupVolume = async ( `; if (!turnOff) { - return baseCommand; + return ` + ${backupCommand} + ${uploadCommand} + `; } const serviceLockId = @@ -110,9 +116,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 +154,9 @@ export const backupVolume = async ( } return lockWrapper(` ${stopCommand} - ${baseCommand} + ${backupCommand} ${startCommand} + ${uploadCommand} `); } };