Merge branch 'next' into main

app/Jobs/DatabaseBackupJob.php

@@ -484,6 +484,11 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
 
             $fullImageName = $this->getFullImageName();
 
+            $containerExists = instant_remote_process(["docker ps -a -q -f name=backup-of-{$this->backup->uuid}"], $this->server, false);
+            if (filled($containerExists)) {
+                instant_remote_process(["docker rm -f backup-of-{$this->backup->uuid}"], $this->server, false);
+            }
+
             if (isDev()) {
                 if ($this->database->name === 'coolify-db') {
                     $backup_location_from = '/var/lib/docker/volumes/coolify_dev_backups_data/_data/coolify/coolify-db-'.$this->server->ip.$this->backup_file;

app/Livewire/Project/Service/FileStorage.php

@@ -49,7 +49,6 @@ class FileStorage extends Component
             $this->workdir = null;
             $this->fs_path = $this->fileStorage->fs_path;
         }
-        $this->fileStorage->loadStorageOnServer();
     }
 
     public function convertToDirectory()
@@ -68,6 +67,18 @@ class FileStorage extends Component
         }
     }
 
+    public function loadStorageOnServer()
+    {
+        try {
+            $this->fileStorage->loadStorageOnServer();
+            $this->dispatch('success', 'File storage loaded from server.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        } finally {
+            $this->dispatch('refreshStorages');
+        }
+    }
+
     public function convertToFile()
     {
         try {

app/Livewire/Server/Proxy/Deploy.php

@@ -65,7 +65,6 @@ class Deploy extends Component
     public function restart()
     {
         try {
-            $this->stop();
             $this->dispatch('checkProxy');
         } catch (\Throwable $e) {
             return handleError($e, $this);

app/Livewire/SettingsEmail.php

@@ -235,7 +235,7 @@ class SettingsEmail extends Component
                 throw new \Exception('Too many messages sent!');
             }
         } catch (\Throwable $e) {
-            return handleError($e);
+            return handleError($e, $this);
         }
     }
 }

app/Models/LocalFileVolume.php

@@ -9,8 +9,8 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 class LocalFileVolume extends BaseModel
 {
     protected $casts = [
-        'fs_path' => 'encrypted',
+        // 'fs_path' => 'encrypted',
-        'mount_path' => 'encrypted',
+        // 'mount_path' => 'encrypted',
         'content' => 'encrypted',
         'is_directory' => 'boolean',
     ];
@@ -176,4 +176,19 @@ class LocalFileVolume extends BaseModel
 
         return instant_remote_process($commands, $server);
     }
+
+    // Accessor for convenient access
+    protected function plainMountPath(): Attribute
+    {
+        return Attribute::make(
+            get: fn () => $this->mount_path,
+            set: fn ($value) => $this->mount_path = $value
+        );
+    }
+
+    // Scope for searching
+    public function scopeWherePlainMountPath($query, $path)
+    {
+        return $query->get()->where('plain_mount_path', $path);
+    }
 }

app/Notifications/Channels/EmailChannel.php

@@ -2,69 +2,68 @@
 
 namespace App\Notifications\Channels;
 
-use App\Services\ConfigurationRepository;
-use Exception;
-use Illuminate\Mail\Message;
 use Illuminate\Notifications\Notification;
-use Illuminate\Support\Facades\Mail;
+use Resend;
 
 class EmailChannel
 {
-    private ConfigurationRepository $configRepository;
+    public function __construct() {}
-
-    public function __construct(ConfigurationRepository $configRepository)
-    {
-        $this->configRepository = $configRepository;
-    }
 
     public function send(SendsEmail $notifiable, Notification $notification): void
     {
-        try {
+        $useInstanceEmailSettings = $notifiable->emailNotificationSettings->use_instance_email_settings;
-            $this->bootConfigs($notifiable);
+        $customEmails = data_get($notification, 'emails', null);
+        if ($useInstanceEmailSettings) {
+            $settings = instanceSettings();
+        } else {
+            $settings = $notifiable->emailNotificationSettings;
+        }
+        $isResendEnabled = $settings->resend_enabled;
+        $isSmtpEnabled = $settings->smtp_enabled;
+        if ($customEmails) {
+            $recipients = [$customEmails];
+        } else {
             $recipients = $notifiable->getRecipients();
-            if (count($recipients) === 0) {
+        }
-                throw new Exception('No email recipients found');
+        $mailMessage = $notification->toMail($notifiable);
-            }
 
-            $mailMessage = $notification->toMail($notifiable);
+        if ($isResendEnabled) {
-            Mail::send(
+            $resend = Resend::client($settings->resend_api_key);
-                [],
+            $from = "{$settings->smtp_from_name} <{$settings->smtp_from_address}>";
-                [],
+            $resend->emails->send([
-                fn (Message $message) => $message
+                'from' => $from,
-                    ->to($recipients)
+                'to' => $recipients,
-                    ->subject($mailMessage->subject)
+                'subject' => $mailMessage->subject,
-                    ->html((string) $mailMessage->render())
+                'html' => (string) $mailMessage->render(),
+            ]);
+        } elseif ($isSmtpEnabled) {
+            $encryption = match (strtolower($settings->smtp_encryption)) {
+                'starttls' => null,
+                'tls' => 'tls',
+                'none' => null,
+                default => null,
+            };
+
+            $transport = new \Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport(
+                $settings->smtp_host,
+                $settings->smtp_port,
+                $encryption
             );
-        } catch (Exception $e) {
+            $transport->setUsername($settings->smtp_username);
-            $error = $e->getMessage();
+            $transport->setPassword($settings->smtp_password);
-            if ($error === 'No email settings found.') {
+
-                throw $e;
+            $mailer = new \Symfony\Component\Mailer\Mailer($transport);
-            }
+
-            $message = "EmailChannel error: {$e->getMessage()}. Failed to send email to:";
+            $fromEmail = $settings->smtp_from_address ?? 'noreply@localhost';
-            if (isset($recipients)) {
+            $fromName = $settings->smtp_from_name ?? 'System';
-                $message .= implode(', ', $recipients);
+            $from = new \Symfony\Component\Mime\Address($fromEmail, $fromName);
-            }
+            $email = (new \Symfony\Component\Mime\Email)
-            if (isset($mailMessage)) {
+                ->from($from)
-                $message .= " with subject: {$mailMessage->subject}";
+                ->to(...$recipients)
-            }
+                ->subject($mailMessage->subject)
-            send_internal_notification($message);
+                ->html((string) $mailMessage->render());
-            throw $e;
+
+            $mailer->send($email);
         }
     }
-
-    private function bootConfigs($notifiable): void
-    {
-        $emailSettings = $notifiable->emailNotificationSettings;
-
-        if ($emailSettings->use_instance_email_settings) {
-            $type = set_transanctional_email_settings();
-            if (blank($type)) {
-                throw new Exception('No email settings found.');
-            }
-
-            return;
-        }
-
-        $this->configRepository->updateMailConfig($emailSettings);
-    }
 }

bootstrap/helpers/docker.php

@@ -8,6 +8,7 @@ use App\Models\ServiceApplication;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Spatie\Url\Url;
+use Symfony\Component\Yaml\Yaml;
 use Visus\Cuid2\Cuid2;
 
 function getCurrentApplicationContainerStatus(Server $server, int $id, ?int $pullRequestId = null, ?bool $includePullrequests = false): Collection
@@ -834,7 +835,15 @@ function validateComposeFile(string $compose, int $server_id): string|Throwable
         if (! $server) {
             throw new \Exception('Server not found');
         }
-        $base64_compose = base64_encode($compose);
+        $yaml_compose = Yaml::parse($compose);
+        foreach ($yaml_compose['services'] as $service_name => $service) {
+            foreach ($service['volumes'] as $volume_name => $volume) {
+                if (data_get($volume, 'type') === 'bind' && data_get($volume, 'content')) {
+                    unset($yaml_compose['services'][$service_name]['volumes'][$volume_name]['content']);
+                }
+            }
+        }
+        $base64_compose = base64_encode(Yaml::dump($yaml_compose));
         instant_remote_process([
             "echo {$base64_compose} | base64 -d | tee /tmp/{$uuid}.yml > /dev/null",
             "chmod 600 /tmp/{$uuid}.yml",

bootstrap/helpers/shared.php

@@ -1250,13 +1250,23 @@ function get_public_ips()
 function isAnyDeploymentInprogress()
 {
     $runningJobs = ApplicationDeploymentQueue::where('horizon_job_worker', gethostname())->where('status', ApplicationDeploymentStatus::IN_PROGRESS->value)->get();
+    $basicDetails = $runningJobs->map(function ($job) {
+        return [
+            'id' => $job->id,
+            'created_at' => $job->created_at,
+            'application_id' => $job->application_id,
+            'server_id' => $job->server_id,
+            'horizon_job_id' => $job->horizon_job_id,
+            'status' => $job->status,
+        ];
+    });
+    echo 'Running jobs: '.json_encode($basicDetails)."\n";
     $horizonJobIds = [];
     foreach ($runningJobs as $runningJob) {
         $horizonJobStatus = getJobStatus($runningJob->horizon_job_id);
-        if ($horizonJobStatus === 'unknown') {
+        if ($horizonJobStatus === 'unknown' || $horizonJobStatus === 'reserved') {
-            return true;
+            $horizonJobIds[] = $runningJob->horizon_job_id;
         }
-        $horizonJobIds[] = $runningJob->horizon_job_id;
     }
     if (count($horizonJobIds) === 0) {
         echo "No deployments in progress.\n";
@@ -1665,6 +1675,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                             if ($source->value() === '/tmp' || $source->value() === '/tmp/') {
                                 return $volume;
                             }
+
                             LocalFileVolume::updateOrCreate(
                                 [
                                     'mount_path' => $target,

config/constants.php

@@ -2,7 +2,7 @@
 
 return [
     'coolify' => [
-        'version' => '4.0.0-beta.401',
+        'version' => '4.0.0-beta.402',
         'helper_version' => '1.0.7',
         'realtime_version' => '1.0.6',
         'self_hosted' => env('SELF_HOSTED', true),

database/migrations/2025_03_29_204400_revert_some_local_volume_encryption.php

@@ -0,0 +1,96 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        if (DB::table('local_file_volumes')->exists()) {
+            DB::table('local_file_volumes')
+                ->orderBy('id')
+                ->chunk(100, function ($volumes) {
+                    foreach ($volumes as $volume) {
+                        DB::beginTransaction();
+
+                        try {
+                            $fs_path = $volume->fs_path;
+                            $mount_path = $volume->mount_path;
+                            try {
+                                if ($fs_path) {
+                                    $fs_path = Crypt::decryptString($fs_path);
+                                }
+                            } catch (\Exception $e) {
+                            }
+
+                            try {
+                                if ($mount_path) {
+                                    $mount_path = Crypt::decryptString($mount_path);
+                                }
+                            } catch (\Exception $e) {
+                            }
+
+                            DB::table('local_file_volumes')->where('id', $volume->id)->update([
+                                'fs_path' => $fs_path,
+                                'mount_path' => $mount_path,
+                            ]);
+                            echo "Updated volume {$volume->id}\n";
+                        } catch (\Exception $e) {
+                            echo "Error encrypting local file volume fields: {$e->getMessage()}\n";
+                            Log::error('Error encrypting local file volume fields: '.$e->getMessage());
+                        }
+                        DB::commit();
+                    }
+                });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        if (DB::table('local_file_volumes')->exists()) {
+            DB::table('local_file_volumes')
+                ->orderBy('id')
+                ->chunk(100, function ($volumes) {
+                    foreach ($volumes as $volume) {
+                        DB::beginTransaction();
+                        try {
+                            $fs_path = $volume->fs_path;
+                            $mount_path = $volume->mount_path;
+                            try {
+                                if ($fs_path) {
+                                    $fs_path = Crypt::encrypt($fs_path);
+                                }
+                            } catch (\Exception $e) {
+                            }
+
+                            try {
+                                if ($mount_path) {
+                                    $mount_path = Crypt::encrypt($mount_path);
+                                }
+                            } catch (\Exception $e) {
+                            }
+
+                            DB::table('local_file_volumes')->where('id', $volume->id)->update([
+                                'fs_path' => $fs_path,
+                                'mount_path' => $mount_path,
+                            ]);
+                            echo "Updated volume {$volume->id}\n";
+                        } catch (\Exception $e) {
+                            echo "Error decrypting local file volume fields: {$e->getMessage()}\n";
+                            Log::error('Error decrypting local file volume fields: '.$e->getMessage());
+                        }
+                        DB::commit();
+                    }
+                });
+        }
+    }
+};

other/nightly/versions.json

@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.401"
+            "version": "4.0.0-beta.402"
         },
         "nightly": {
-            "version": "4.0.0-beta.402"
+            "version": "4.0.0-beta.403"
         },
         "helper": {
             "version": "1.0.7"

resources/views/livewire/notifications/email.blade.php

@@ -14,7 +14,7 @@
                     <x-modal-input buttonTitle="Send Test Email" title="Send Test Email">
                         <form wire:submit.prevent="sendTestEmail" class="flex flex-col w-full gap-2">
                             <x-forms.input wire:model="testEmailAddress" placeholder="test@example.com"
-                                id="testEmailAddress" label="Recipients" required />
+                                id="testEmailAddress" label="Recipient" required />
                             <x-forms.button type="submit" @click="modalOpen=false">
                                 Send Email
                             </x-forms.button>

resources/views/livewire/project/service/file-storage.blade.php

@@ -1,16 +1,9 @@
-<div class="py-4 ">
+<div class="">
     <div class="flex flex-col justify-center pb-4 text-sm select-text">
-        {{-- @if (data_get($resource, 'build_pack') === 'dockercompose')
+        <div class="flex gap-2  md:flex-row flex-col pt-4">
-            <h4>{{ data_get($resource, 'name', 'unknown') }}</h4>
+            <x-forms.input label="Source Path" :value="$fileStorage->fs_path" readonly />
-        @endif --}}
+            <x-forms.input label="Destination Path" :value="$fileStorage->mount_path" readonly />
-        @if ($fileStorage->is_directory)
+        </div>
-            <h4 class="dark:text-white pt-4 border-t dark:border-coolgray-200">Directory Mount</h4>
-        @else
-            <h4 class="dark:text-white pt-4 border-t dark:border-coolgray-200">File Mount</h4>
-        @endif
-
-        <x-forms.input label="Source Path" :value="$fileStorage->fs_path" readonly />
-        <x-forms.input label="Destination Path" :value="$fileStorage->mount_path" readonly />
     </div>
     <form wire:submit='submit' class="flex flex-col gap-2">
         <div class="flex gap-2">
@@ -39,6 +32,7 @@
                         confirmationLabel="Please confirm the execution of the actions by entering the Filepath below"
                         shortConfirmationLabel="Filepath" :confirmWithPassword="false" step2ButtonText="Convert to directory" />
                 @endif
+                <x-forms.button type="button" wire:click="loadStorageOnServer">Load from server</x-forms.button>
                 <x-modal-confirmation :ignoreWire="false" title="Confirm File Deletion?" buttonTitle="Delete"
                     isErrorButton submitAction="delete" :checkboxes="$fileDeletionCheckboxes" :actions="['The selected file will be permanently deleted from the container.']"
                     confirmationText="{{ $fs_path }}"

resources/views/livewire/project/shared/storages/show.blade.php

@@ -2,45 +2,53 @@
     <form wire:submit='submit' class="flex flex-col gap-2 xl:items-end xl:flex-row">
         @if ($isReadOnly)
             @if ($isFirst)
-                @if (
+                <div class="flex gap-2 items-end w-full  md:flex-row flex-col">
-                    $storage->resource_type === 'App\Models\ServiceApplication' ||
+                    @if (
-                        $storage->resource_type === 'App\Models\ServiceDatabase')
+                        $storage->resource_type === 'App\Models\ServiceApplication' ||
-                    <x-forms.input id="storage.name" label="Volume Name" required readonly
+                            $storage->resource_type === 'App\Models\ServiceDatabase')
-                        helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." />
+                        <x-forms.input id="storage.name" label="Volume Name" required readonly
-                @else
+                            helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." />
-                    <x-forms.input id="storage.name" label="Volume Name" required
+                    @else
-                        helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." />
+                        <x-forms.input id="storage.name" label="Volume Name" required
-                @endif
+                            helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." />
-                @if ($isService || $startedAt)
+                    @endif
-                    <x-forms.input id="storage.host_path" readonly helper="Directory on the host system."
+                    @if ($isService || $startedAt)
-                        label="Source Path"
+                        <x-forms.input id="storage.host_path" readonly helper="Directory on the host system."
-                        helper="Warning: Changing the source path after the initial start could cause problems. Only use it when you know what are you doing." />
+                            label="Source Path"
-                    <x-forms.input id="storage.mount_path" label="Destination Path"
+                            helper="Warning: Changing the source path after the initial start could cause problems. Only use it when you know what are you doing." />
-                        helper="Directory inside the container." required readonly />
+                        <x-forms.input id="storage.mount_path" label="Destination Path"
-                @else
+                            helper="Directory inside the container." required readonly />
-                    <x-forms.input id="storage.host_path" helper="Directory on the host system." label="Source Path"
+                    @else
-                        helper="Warning: Changing the source path after the initial start could cause problems. Only use it when you know what are you doing." />
+                        <x-forms.input id="storage.host_path" helper="Directory on the host system." label="Source Path"
-                    <x-forms.input id="storage.mount_path" label="Destination Path"
+                            helper="Warning: Changing the source path after the initial start could cause problems. Only use it when you know what are you doing." />
-                        helper="Directory inside the container." required readonly />
+                        <x-forms.input id="storage.mount_path" label="Destination Path"
-                    <x-forms.button type="submit">
+                            helper="Directory inside the container." required readonly />
-                        Update
+                        <x-forms.button type="submit">
-                    </x-forms.button>
+                            Update
-                @endif
+                        </x-forms.button>
+                    @endif
+                </div>
             @else
-                <x-forms.input id="storage.name" required readonly />
+                <div class="flex gap-2 items-end w-full">
-                <x-forms.input id="storage.host_path" readonly />
+                    <x-forms.input id="storage.name" required readonly />
-                <x-forms.input id="storage.mount_path" required readonly />
+                    <x-forms.input id="storage.host_path" readonly />
+                    <x-forms.input id="storage.mount_path" required readonly />
+                </div>
             @endif
         @else
             @if ($isFirst)
-                <x-forms.input id="storage.name" label="Volume Name" required />
+                <div class="flex gap-2 items-end w-full">
-                <x-forms.input id="storage.host_path" helper="Directory on the host system." label="Source Path" />
+                    <x-forms.input id="storage.name" label="Volume Name" required />
-                <x-forms.input id="storage.mount_path" label="Destination Path" helper="Directory inside the container."
+                    <x-forms.input id="storage.host_path" helper="Directory on the host system." label="Source Path" />
-                    required />
+                    <x-forms.input id="storage.mount_path" label="Destination Path"
+                        helper="Directory inside the container." required />
+                </div>
             @else
-                <x-forms.input id="storage.name" required />
+                <div class="flex gap-2 items-end w-full">
-                <x-forms.input id="storage.host_path" />
+                    <x-forms.input id="storage.name" required />
-                <x-forms.input id="storage.mount_path" required />
+                    <x-forms.input id="storage.host_path" />
+                    <x-forms.input id="storage.mount_path" required />
+                </div>
             @endif
             <div class="flex gap-2">
                 <x-forms.button type="submit">

resources/views/livewire/settings-email.blade.php

@@ -13,7 +13,7 @@
                 <x-modal-input buttonTitle="Send Test Email" title="Send Test Email">
                     <form wire:submit.prevent="sendTestEmail" class="flex flex-col w-full gap-2">
                         <x-forms.input wire:model="testEmailAddress" placeholder="test@example.com" id="testEmailAddress"
-                            label="Recipients" required />
+                            label="Recipient" required />
                         <x-forms.button type="submit" @click="modalOpen=false">
                             Send Email
                         </x-forms.button>

versions.json

@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.401"
+            "version": "4.0.0-beta.402"
         },
         "nightly": {
-            "version": "4.0.0-beta.402"
+            "version": "4.0.0-beta.403"
         },
         "helper": {
             "version": "1.0.7"