revert: databasebackup

Author: andrasbacsai

app/Jobs/DatabaseBackupJob.php

@@ -4,6 +4,7 @@
 
 use App\Actions\Database\StopDatabase;
 use App\Events\BackupCreated;
+use App\Models\InstanceSettings;
 use App\Models\S3Storage;
 use App\Models\ScheduledDatabaseBackup;
 use App\Models\ScheduledDatabaseBackupExecution;
@@ -478,10 +479,37 @@ private function remove_old_backups(): void
         }
     }
 
+    // private function upload_to_s3(): void
+    // {
+    //     try {
+    //         if (is_null($this->s3)) {
+    //             return;
+    //         }
+    //         $key = $this->s3->key;
+    //         $secret = $this->s3->secret;
+    //         // $region = $this->s3->region;
+    //         $bucket = $this->s3->bucket;
+    //         $endpoint = $this->s3->endpoint;
+    //         $this->s3->testConnection(shouldSave: true);
+    //         $configName = new Cuid2;
+
+    //         $s3_copy_dir = str($this->backup_location)->replace(backup_dir(), '/var/www/html/storage/app/backups/');
+    //         $commands[] = "docker exec coolify bash -c 'mc config host add {$configName} {$endpoint} $key $secret'";
+    //         $commands[] = "docker exec coolify bash -c 'mc cp $s3_copy_dir {$configName}/{$bucket}{$this->backup_dir}/'";
+    //         instant_remote_process($commands, $this->server);
+    //         $this->add_to_backup_output('Uploaded to S3.');
+    //     } catch (\Throwable $e) {
+    //         $this->add_to_backup_output($e->getMessage());
+    //         throw $e;
+    //     } finally {
+    //         $removeConfigCommands[] = "docker exec coolify bash -c 'mc config remove {$configName}'";
+    //         $removeConfigCommands[] = "docker exec coolify bash -c 'mc alias rm {$configName}'";
+    //         instant_remote_process($removeConfigCommands, $this->server, false);
+    //     }
+    // }
     private function upload_to_s3(): void
     {
         try {
-            ray($this->backup_location);
             if (is_null($this->s3)) {
                 return;
             }
@@ -491,20 +519,64 @@ private function upload_to_s3(): void
             $bucket = $this->s3->bucket;
             $endpoint = $this->s3->endpoint;
             $this->s3->testConnection(shouldSave: true);
-            $configName = new Cuid2;
+            if (data_get($this->backup, 'database_type') === 'App\Models\ServiceDatabase') {
+                $network = $this->database->service->destination->network;
+            } else {
+                $network = $this->database->destination->network;
+            }
 
-            $s3_copy_dir = str($this->backup_location)->replace(backup_dir(), '/var/www/html/storage/app/backups/');
-            $commands[] = "docker exec coolify bash -c 'mc config host add {$configName} {$endpoint} $key $secret'";
-            $commands[] = "docker exec coolify bash -c 'mc cp $s3_copy_dir {$configName}/{$bucket}{$this->backup_dir}/'";
+            $this->ensureHelperImageAvailable();
+
+            $fullImageName = $this->getFullImageName();
+            $commands[] = "docker run -d --network {$network} --name backup-of-{$this->backup->uuid} --rm -v $this->backup_location:$this->backup_location:ro {$fullImageName}";
+            $commands[] = "docker exec backup-of-{$this->backup->uuid} mc config host add temporary {$endpoint} $key $secret";
+            $commands[] = "docker exec backup-of-{$this->backup->uuid} mc cp $this->backup_location temporary/$bucket{$this->backup_dir}/";
             instant_remote_process($commands, $this->server);
             $this->add_to_backup_output('Uploaded to S3.');
         } catch (\Throwable $e) {
             $this->add_to_backup_output($e->getMessage());
             throw $e;
         } finally {
-            $removeConfigCommands[] = "docker exec coolify bash -c 'mc config remove {$configName}'";
-            $removeConfigCommands[] = "docker exec coolify bash -c 'mc alias rm {$configName}'";
-            instant_remote_process($removeConfigCommands, $this->server, false);
+            $command = "docker rm -f backup-of-{$this->backup->uuid}";
+            instant_remote_process([$command], $this->server);
+        }
+    }
+
+    private function ensureHelperImageAvailable(): void
+    {
+        $fullImageName = $this->getFullImageName();
+
+        $imageExists = $this->checkImageExists($fullImageName);
+
+        if (! $imageExists) {
+            $this->pullHelperImage($fullImageName);
         }
     }
+
+    private function checkImageExists(string $fullImageName): bool
+    {
+        $result = instant_remote_process(["docker image inspect {$fullImageName} >/dev/null 2>&1 && echo 'exists' || echo 'not exists'"], $this->server, false);
+
+        return trim($result) === 'exists';
+    }
+
+    private function pullHelperImage(string $fullImageName): void
+    {
+        try {
+            instant_remote_process(["docker pull {$fullImageName}"], $this->server);
+        } catch (\Exception $e) {
+            $errorMessage = 'Failed to pull helper image: '.$e->getMessage();
+            $this->add_to_backup_output($errorMessage);
+            throw new \RuntimeException($errorMessage);
+        }
+    }
+
+    private function getFullImageName(): string
+    {
+        $settings = InstanceSettings::get();
+        $helperImage = config('coolify.helper_image');
+        $latestVersion = $settings->helper_version;
+
+        return "{$helperImage}:{$latestVersion}";
+    }
 }