Merge pull request #1275 from coollabsio/next

v4.0.0-beta.56

app/Console/Kernel.php

@@ -27,14 +27,23 @@ class Kernel extends ConsoleKernel
             // $this->instance_auto_update($schedule);
             // $this->check_scheduled_backups($schedule);
             $this->check_resources($schedule);
+            $this->cleanup_servers($schedule);
         } else {
             $schedule->command('horizon:snapshot')->everyFiveMinutes();
             $schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer();
             $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer();
-            $schedule->job(new DockerCleanupJob)->everyTenMinutes()->onOneServer();
+            // $schedule->job(new DockerCleanupJob)->everyTenMinutes()->onOneServer();
             $this->instance_auto_update($schedule);
             $this->check_scheduled_backups($schedule);
             $this->check_resources($schedule);
+            $this->cleanup_servers($schedule);
+        }
+    }
+    private function cleanup_servers($schedule)
+    {
+        $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true);
+        foreach ($servers as $server) {
+            $schedule->job(new DockerCleanupJob($server))->everyTenMinutes()->onOneServer();
         }
     }
     private function check_resources($schedule)

app/Http/Livewire/Project/Application/General.php

@@ -22,9 +22,6 @@ class General extends Component
     public string $git_branch;
     public string|null $git_commit_sha;
     public string $build_pack;
-    public string|null $wildcard_domain = null;
-    public string|null $server_wildcard_domain = null;
-    public string|null $global_wildcard_domain = null;
 
     public bool $is_static;
     public bool $is_git_submodules_enabled;
@@ -91,52 +88,31 @@ class General extends Component
         $this->application->settings->save();
         $this->application->save();
         $this->application->refresh();
-        $this->checkWildCardDomain();
         $this->emit('success', 'Application settings updated!');
     }
 
-    protected function checkWildCardDomain()
-    {
-        $coolify_instance_settings = InstanceSettings::get();
-        $this->server_wildcard_domain = data_get($this->application, 'destination.server.settings.wildcard_domain');
-        $this->global_wildcard_domain = data_get($coolify_instance_settings, 'wildcard_domain');
-        $this->wildcard_domain = $this->server_wildcard_domain ?? $this->global_wildcard_domain ?? null;
-    }
+    public function getWildcardDomain() {
+        $server = data_get($this->application, 'destination.server');
+        if ($server) {
+            $fqdn = generateFqdn($server, $this->application->uuid);
+            ray($fqdn);
+            $this->application->fqdn = $fqdn;
+            $this->application->save();
+            $this->emit('success', 'Application settings updated!');
+        }
 
+    }
     public function mount()
     {
-        $this->is_static = $this->application->settings->is_static;
-        $this->is_git_submodules_enabled = $this->application->settings->is_git_submodules_enabled;
-        $this->is_git_lfs_enabled = $this->application->settings->is_git_lfs_enabled;
-        $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
-        $this->is_preview_deployments_enabled = $this->application->settings->is_preview_deployments_enabled;
-        $this->is_auto_deploy_enabled = $this->application->settings->is_auto_deploy_enabled;
-        $this->is_force_https_enabled = $this->application->settings->is_force_https_enabled;
-        $this->checkWildCardDomain();
-    }
-
-    public function generateGlobalRandomDomain()
-    {
-        // Set wildcard domain based on Global wildcard domain
-        $url = Url::fromString($this->global_wildcard_domain);
-        $host = $url->getHost();
-        $path = $url->getPath() === '/' ? '' : $url->getPath();
-        $scheme = $url->getScheme();
-        $this->application->fqdn = $scheme . '://' . $this->application->uuid . '.' . $host . $path;
-        $this->application->save();
-        $this->emit('success', 'Application settings updated!');
-    }
-
-    public function generateServerRandomDomain()
-    {
-        // Set wildcard domain based on Server wildcard domain
-        $url = Url::fromString($this->server_wildcard_domain);
-        $host = $url->getHost();
-        $path = $url->getPath() === '/' ? '' : $url->getPath();
-        $scheme = $url->getScheme();
-        $this->application->fqdn = $scheme . '://' . $this->application->uuid . '.' . $host . $path;
-        $this->application->save();
-        $this->emit('success', 'Application settings updated!');
+        if (data_get($this->application,'settings')) {
+            $this->is_static = $this->application->settings->is_static;
+            $this->is_git_submodules_enabled = $this->application->settings->is_git_submodules_enabled;
+            $this->is_git_lfs_enabled = $this->application->settings->is_git_lfs_enabled;
+            $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
+            $this->is_preview_deployments_enabled = $this->application->settings->is_preview_deployments_enabled;
+            $this->is_auto_deploy_enabled = $this->application->settings->is_auto_deploy_enabled;
+            $this->is_force_https_enabled = $this->application->settings->is_force_https_enabled;
+        }
     }
 
     public function submit()

app/Http/Livewire/Project/Application/Previews.php

@@ -72,8 +72,7 @@ class Previews extends Component
     public function stop(int $pull_request_id)
     {
         try {
-            $container_name = generateApplicationContainerName($this->application);
-            ray('Stopping container: ' . $container_name);
+            $container_name = generateApplicationContainerName($this->application, $pull_request_id);
 
             instant_remote_process(["docker rm -f $container_name"], $this->application->destination->server, throwError: false);
             ApplicationPreview::where('application_id', $this->application->id)->where('pull_request_id', $pull_request_id)->delete();

app/Http/Livewire/Project/Database/CreateScheduledBackup.php

@@ -10,7 +10,7 @@ class CreateScheduledBackup extends Component
     public $database;
     public $frequency;
     public bool $enabled = true;
-    public bool $save_s3 = true;
+    public bool $save_s3 = false;
     public $s3_storage_id;
     public $s3s;
 

app/Http/Livewire/Project/New/GithubPrivateRepository.php

@@ -11,6 +11,7 @@ use App\Traits\SaveFromRedirect;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Route;
 use Livewire\Component;
+use Spatie\Url\Url;
 
 class GithubPrivateRepository extends Component
 {
@@ -95,6 +96,7 @@ class GithubPrivateRepository extends Component
                 $this->loadBranchByPage();
             }
         }
+        $this->selected_branch_name = data_get($this->branches,'0.name');
     }
 
     protected function loadBranchByPage()
@@ -144,8 +146,9 @@ class GithubPrivateRepository extends Component
             $application->settings->is_static = $this->is_static;
             $application->settings->save();
 
-            $sslip = sslip($destination->server);
-            $application->fqdn = "http://{$application->uuid}.$sslip";
+            $fqdn = generateFqdn($destination->server, $application->uuid);
+            $application->fqdn = $fqdn;
+
             $application->name = generate_application_name($this->selected_repository_owner . '/' . $this->selected_repository_repo, $this->selected_branch_name, $application->uuid);
             $application->save();
 

app/Http/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php

@@ -46,7 +46,6 @@ class GithubPrivateRepositoryDeployKey extends Component
     private GithubApp|GitlabApp|null $git_source = null;
     private string $git_host;
     private string $git_repository;
-    private string $git_branch;
 
     public function mount()
     {
@@ -96,7 +95,7 @@ class GithubPrivateRepositoryDeployKey extends Component
             $application_init = [
                 'name' => generate_random_name(),
                 'git_repository' => $this->git_repository,
-                'git_branch' => $this->git_branch,
+                'git_branch' => $this->branch,
                 'git_full_url' => "git@$this->git_host:$this->git_repository.git",
                 'build_pack' => 'nixpacks',
                 'ports_exposes' => $this->port,
@@ -112,8 +111,8 @@ class GithubPrivateRepositoryDeployKey extends Component
             $application->settings->is_static = $this->is_static;
             $application->settings->save();
 
-            $sslip = sslip($destination->server);
-            $application->fqdn = "http://{$application->uuid}.$sslip";
+            $fqdn = generateFqdn($destination->server, $application->uuid);
+            $application->fqdn = $fqdn;
             $application->name = generate_random_name($application->uuid);
             $application->save();
 
@@ -132,11 +131,6 @@ class GithubPrivateRepositoryDeployKey extends Component
         $this->repository_url_parsed = Url::fromString($this->repository_url);
         $this->git_host = $this->repository_url_parsed->getHost();
         $this->git_repository = $this->repository_url_parsed->getSegment(1) . '/' . $this->repository_url_parsed->getSegment(2);
-        if ($this->branch) {
-            $this->git_branch = $this->branch;
-        } else {
-            $this->git_branch = $this->repository_url_parsed->getSegment(4) ?? 'main';
-        }
 
         if ($this->git_host == 'github.com') {
             $this->git_source = GithubApp::where('name', 'Public GitHub')->first();

app/Http/Livewire/Project/New/PublicGitRepository.php

@@ -26,6 +26,10 @@ class PublicGitRepository extends Component
     public string $git_branch = 'main';
     public int $rate_limit_remaining = 0;
     public $rate_limit_reset = 0;
+    private object $repository_url_parsed;
+    public GithubApp|GitlabApp|null $git_source = null;
+    public string $git_host;
+    public string $git_repository;
     protected $rules = [
         'repository_url' => 'required|url',
         'port' => 'required|numeric',
@@ -38,10 +42,6 @@ class PublicGitRepository extends Component
         'is_static' => 'static',
         'publish_directory' => 'publish directory',
     ];
-    private object $repository_url_parsed;
-    private GithubApp|GitlabApp|null $git_source = null;
-    private string $git_host;
-    private string $git_repository;
 
     public function mount()
     {
@@ -76,13 +76,15 @@ class PublicGitRepository extends Component
             $this->get_branch();
             $this->selected_branch = $this->git_branch;
         } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-        if (!$this->branch_found && $this->git_branch == 'main') {
-            try {
-                $this->git_branch = 'master';
-                $this->get_branch();
-            } catch (\Throwable $e) {
+            ray($e->getMessage());
+            if (!$this->branch_found && $this->git_branch == 'main') {
+                try {
+                    $this->git_branch = 'master';
+                    $this->get_branch();
+                } catch (\Throwable $e) {
+                    return handleError($e, $this);
+                }
+            } else {
                 return handleError($e, $this);
             }
         }
@@ -122,9 +124,6 @@ class PublicGitRepository extends Component
             $project_uuid = $this->parameters['project_uuid'];
             $environment_name = $this->parameters['environment_name'];
 
-            $this->get_git_source();
-            $this->git_branch = $this->selected_branch ?? $this->git_branch;
-
             $destination = StandaloneDocker::where('uuid', $destination_uuid)->first();
             if (!$destination) {
                 $destination = SwarmDocker::where('uuid', $destination_uuid)->first();
@@ -156,8 +155,8 @@ class PublicGitRepository extends Component
             $application->settings->is_static = $this->is_static;
             $application->settings->save();
 
-            $sslip = sslip($destination->server);
-            $application->fqdn = "http://{$application->uuid}.$sslip";
+            $fqdn = generateFqdn($destination->server, $application->uuid);
+            $application->fqdn = $fqdn;
             $application->name = generate_application_name($this->git_repository, $this->git_branch, $application->uuid);
             $application->save();
 

app/Http/Livewire/Project/New/SimpleDockerfile.php

@@ -45,6 +45,9 @@ CMD ["nginx", "-g", "daemon off;"]
         $environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first();
 
         $port = get_port_from_dockerfile($this->dockerfile);
+        if (!$port) {
+            $port = 80;
+        }
         $application = Application::create([
             'name' => 'dockerfile-' . new Cuid2(7),
             'repository_project_id' => 0,
@@ -56,14 +59,15 @@ CMD ["nginx", "-g", "daemon off;"]
             'environment_id' => $environment->id,
             'destination_id' => $destination->id,
             'destination_type' => $destination_class,
+            'health_check_enabled' => false,
             'source_id' => 0,
             'source_type' => GithubApp::class
         ]);
 
-        $sslip = sslip($destination->server);
+        $fqdn = generateFqdn($destination->server, $application->uuid);
         $application->update([
             'name' => 'dockerfile-' . $application->uuid,
-            'fqdn' => "http://{$application->uuid}.$sslip"
+            'fqdn' => $fqdn
         ]);
 
         redirect()->route('project.application.configuration', [

app/Http/Livewire/Project/Service/ComposeModal.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Livewire\Project\Service;
+
+use Livewire\Component;
+
+class ComposeModal extends Component
+{
+    public string $raw;
+    public string $actual;
+    public function render()
+    {
+        return view('livewire.project.service.compose-modal');
+    }
+    public function submit() {
+        $this->emit('warning', "Saving new docker compose...");
+        $this->emit('saveCompose', $this->raw);
+    }
+}

app/Http/Livewire/Project/Service/FileStorage.php

@@ -13,6 +13,7 @@ class FileStorage extends Component
     public LocalFileVolume $fileStorage;
     public ServiceApplication|ServiceDatabase $service;
     public string $fs_path;
+    public ?string $workdir = null;
 
     protected $rules = [
         'fileStorage.is_directory' => 'required',
@@ -23,22 +24,28 @@ class FileStorage extends Component
     public function mount()
     {
         $this->service = $this->fileStorage->service;
-        $this->fs_path = Str::of($this->fileStorage->fs_path)->beforeLast('/');
-        $file = Str::of($this->fileStorage->fs_path)->afterLast('/');
-        if (Str::of($this->fs_path)->startsWith('.')) {
-            $this->fs_path = Str::of($this->fs_path)->after('.');
-            $this->fs_path = $this->service->service->workdir() . $this->fs_path . "/" . $file;
-        }
-
+         if (Str::of($this->fileStorage->fs_path)->startsWith('.')) {
+            $this->workdir = $this->service->service->workdir();
+            $this->fs_path = Str::of($this->fileStorage->fs_path)->after('.');
+         } else {
+            $this->workdir = null;
+            $this->fs_path = $this->fileStorage->fs_path;
+         }
     }
     public function submit()
     {
+        $original = $this->fileStorage->getOriginal();
         try {
             $this->validate();
+            if ($this->fileStorage->is_directory) {
+                $this->fileStorage->content = null;
+            }
             $this->fileStorage->save();
-            $this->service->saveFileVolumes();
+            $this->fileStorage->saveStorageOnServer($this->service);
             $this->emit('success', 'File updated successfully.');
         } catch (\Throwable $e) {
+            $this->fileStorage->setRawAttributes($original);
+            $this->fileStorage->save();
             return handleError($e, $this);
         }
     }

app/Http/Livewire/Project/Service/Index.php

@@ -4,7 +4,6 @@ namespace App\Http\Livewire\Project\Service;
 
 use App\Jobs\ContainerStatusJob;
 use App\Models\Service;
-use DanHarrin\LivewireRateLimiting\WithRateLimiting;
 use Livewire\Component;
 
 class Index extends Component
@@ -20,7 +19,25 @@ class Index extends Component
         'service.name' => 'required',
         'service.description' => 'nullable',
     ];
-    public function checkStatus() {
+    protected $listeners = ["saveCompose"];
+    public function render()
+    {
+        return view('livewire.project.service.index');
+    }
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+        $this->query = request()->query();
+        $this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
+        $this->refreshStack();
+    }
+    public function saveCompose($raw)
+    {
+        $this->service->docker_compose_raw = $raw;
+        $this->submit();
+    }
+    public function checkStatus()
+    {
         dispatch_sync(new ContainerStatusJob($this->service->server));
         $this->refreshStack();
     }
@@ -35,17 +52,8 @@ class Index extends Component
             $database->refresh();
         });
     }
-    public function mount()
-    {
-        $this->parameters = get_route_parameters();
-        $this->query = request()->query();
-        $this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
-        $this->refreshStack();
-    }
-    public function render()
-    {
-        return view('livewire.project.service.index');
-    }
+
+
     public function submit()
     {
         try {

app/Http/Livewire/Project/Service/Show.php

@@ -20,16 +20,26 @@ class Show extends Component
 
     public function mount()
     {
-        $this->services = collect([]);
-        $this->parameters = get_route_parameters();
-        $this->query = request()->query();
-        $this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
-        $service = $this->service->applications()->whereName($this->parameters['service_name'])->first();
-        if ($service) {
-            $this->serviceApplication = $service;
-        } else {
-            $this->serviceDatabase = $this->service->databases()->whereName($this->parameters['service_name'])->first();
+        try {
+            $this->services = collect([]);
+            $this->parameters = get_route_parameters();
+            $this->query = request()->query();
+            $this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
+            $service = $this->service->applications()->whereName($this->parameters['service_name'])->first();
+            if ($service) {
+                $this->serviceApplication = $service;
+                $this->serviceApplication->getFilesFromServer();
+            } else {
+                $this->serviceDatabase = $this->service->databases()->whereName($this->parameters['service_name'])->first();
+                $this->serviceDatabase->getFilesFromServer();
+            }
+            if (is_null($service)) {
+                throw new \Exception("Service not found.");
+            }
+        } catch(\Throwable $e) {
+            return handleError($e, $this);
         }
+
     }
     public function generateDockerCompose()
     {

app/Http/Livewire/Project/Shared/HealthChecks.php

@@ -9,6 +9,7 @@ class HealthChecks extends Component
 
     public $resource;
     protected $rules = [
+        'resource.health_check_enabled' => 'boolean',
         'resource.health_check_path' => 'string',
         'resource.health_check_port' => 'nullable|string',
         'resource.health_check_host' => 'string',
@@ -22,12 +23,19 @@ class HealthChecks extends Component
         'resource.health_check_start_period' => 'integer',
 
     ];
+    public function instantSave()
+    {
+        $this->resource->save();
+        $this->emit('success', 'Health check updated.');
+
+
+    }
     public function submit()
     {
         try {
             $this->validate();
             $this->resource->save();
-            $this->emit('saved');
+            $this->emit('success', 'Health check updated.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Jobs/ApplicationDeploymentJob.php

@@ -89,7 +89,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->build_workdir = "{$this->workdir}" . rtrim($this->application->base_directory, '/');
         $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
 
-        $this->container_name = generateApplicationContainerName($this->application);
+        $this->container_name = generateApplicationContainerName($this->application, $this->pull_request_id);
         savePrivateKeyToFs($this->server);
         $this->saved_outputs = collect();
 
@@ -97,7 +97,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if ($this->pull_request_id !== 0) {
             $this->preview = ApplicationPreview::findPreviewByApplicationAndPullId($this->application->id, $this->pull_request_id);
             if ($this->application->fqdn) {
-                $preview_fqdn = getFqdnWithoutPort(data_get($this->preview, 'fqdn'));
+                if (data_get($this->preview, 'fqdn')) {
+                    $preview_fqdn = getFqdnWithoutPort(data_get($this->preview, 'fqdn'));
+                }
                 $template = $this->application->preview_url_template;
                 $url = Url::fromString($this->application->fqdn);
                 $host = $url->getHost();
@@ -284,7 +286,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
     private function rolling_update()
     {
-        if (count($this->application->ports_mappings_array) > 0){
+        if (count($this->application->ports_mappings_array) > 0) {
             $this->execute_remote_command(
                 ["echo -n 'Application has ports mapped to the host system, rolling update is not supported. Stopping current container.'"],
             );
@@ -301,6 +303,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     }
     private function health_check()
     {
+        if ($this->application->isHealthcheckDisabled()) {
+            $this->newVersionIsHealthy = true;
+            return;
+        }
         ray('New container name: ', $this->container_name);
         if ($this->container_name) {
             $counter = 0;
@@ -399,7 +405,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     {
         $this->execute_remote_command(
             [
-                "echo -n 'Importing {$this->application->git_repository}:{$this->application->git_branch} to {$this->workdir}. '"
+                "echo -n 'Importing {$this->application->git_repository}:{$this->application->git_branch} (commit sha {$this->application->git_commit_sha}) to {$this->workdir}. '"
             ],
             [
                 $this->importing_git_repository()
@@ -571,6 +577,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 ]
             ]
         ];
+        if ($this->application->isHealthcheckDisabled()) {
+            data_forget($docker_compose, 'services.' . $this->container_name . '.healthcheck');
+        }
         if (count($this->application->ports_mappings_array) > 0 && $this->pull_request_id === 0) {
             $docker_compose['services'][$this->container_name]['ports'] = $this->application->ports_mappings_array;
         }

app/Jobs/ContainerStatusJob.php

@@ -108,9 +108,9 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                 $labelId = data_get($labels, 'coolify.applicationId');
                 if ($labelId) {
                     if (str_contains($labelId, '-pr-')) {
-                        $previewId = (int) Str::after($labelId, '-pr-');
+                        $pullRequestId = data_get($labels, 'coolify.pullRequestId');
                         $applicationId = (int) Str::before($labelId, '-pr-');
-                        $preview = ApplicationPreview::where('application_id', $applicationId)->where('pull_request_id', $previewId)->first();
+                        $preview = ApplicationPreview::where('application_id', $applicationId)->where('pull_request_id', $pullRequestId)->first();
                         if ($preview) {
                             $foundApplicationPreviews[] = $preview->id;
                             $statusFromDb = $preview->status;

app/Jobs/DatabaseBackupJob.php

@@ -61,7 +61,8 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
     public function handle(): void
     {
         try {
-            if (data_get($this->database, 'status') !== 'running') {
+            $status = Str::of(data_get($this->database, 'status'));
+            if (!$status->startsWith('running') && $this->database->id !== 0) {
                 ray('database not running');
                 return;
             }
@@ -89,7 +90,6 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                 $this->upload_to_s3();
             }
             $this->save_backup_logs();
-            // TODO: Notify user
         } catch (\Throwable $e) {
             ray($e->getMessage());
             send_internal_notification('DatabaseBackupJob failed with: ' . $e->getMessage());

app/Jobs/DockerCleanupJob.php

@@ -16,65 +16,66 @@ class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    public $timeout = 500;
+    public $timeout = 1000;
     public ?string $dockerRootFilesystem = null;
     public ?int $usageBefore = null;
 
     public function middleware(): array
     {
-        return [
-            (new WithoutOverlapping("dockerimagejobs"))->shared(),
-        ];
+        return [(new WithoutOverlapping($this->server->uuid))->dontRelease()];
     }
-    public function __construct()
+
+    public function uniqueId(): string
+    {
+        return $this->server->uuid;
+    }
+    public function __construct(public Server $server)
     {
     }
     public function handle(): void
     {
-        $queue = ApplicationDeploymentQueue::where('status', '==', 'in_progress')->get();
-        if ($queue->count() > 0) {
+        $queuedCount = 0;
+        $this->server->applications()->each(function ($application) use ($queuedCount) {
+            $count = data_get($application->deployments(), 'count', 0);
+            $queuedCount += $count;
+        });
+        if ($queuedCount > 0) {
             ray('DockerCleanupJob: ApplicationDeploymentQueue is not empty, skipping')->color('orange');
             return;
         }
         try {
-            // ray()->showQueries()->color('orange');
-            $servers = Server::all();
-            foreach ($servers as $server) {
-                if (
-                    !$server->isFunctional()
-                ) {
-                    continue;
-                }
-                if (isDev()) {
-                    $this->dockerRootFilesystem = "/";
+            if (!$this->server->isFunctional()) {
+                return;
+            }
+            if (isDev()) {
+                $this->dockerRootFilesystem = "/";
+            } else {
+                $this->dockerRootFilesystem = instant_remote_process(
+                    [
+                        "stat --printf=%m $(docker info --format '{{json .DockerRootDir}}'' |sed 's/\"//g')"
+                    ],
+                    $this->server,
+                    false
+                );
+            }
+            if (!$this->dockerRootFilesystem) {
+                return;
+            }
+            $this->usageBefore = $this->getFilesystemUsage();
+            if ($this->usageBefore >= $this->server->settings->cleanup_after_percentage) {
+                ray('Cleaning up ' . $this->server->name)->color('orange');
+                instant_remote_process(['docker image prune -af'], $this->server);
+                instant_remote_process(['docker container prune -f --filter "label=coolify.managed=true"'], $this->server);
+                instant_remote_process(['docker builder prune -af'], $this->server);
+                $usageAfter = $this->getFilesystemUsage();
+                if ($usageAfter <  $this->usageBefore) {
+                    ray('Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name)->color('orange');
+                    send_internal_notification('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $this->server->name);
                 } else {
-                    $this->dockerRootFilesystem = instant_remote_process(
-                        [
-                            "stat --printf=%m $(docker info --format '{{json .DockerRootDir}}'' |sed 's/\"//g')"
-                        ],
-                        $server,
-                        false
-                    );
-                }
-                if (!$this->dockerRootFilesystem) {
-                    continue;
-                }
-                $this->usageBefore = $this->getFilesystemUsage($server);
-                if ($this->usageBefore >= $server->settings->cleanup_after_percentage) {
-                    ray('Cleaning up ' . $server->name)->color('orange');
-                    instant_remote_process(['docker image prune -af'], $server);
-                    instant_remote_process(['docker container prune -f --filter "label=coolify.managed=true"'], $server);
-                    instant_remote_process(['docker builder prune -af'], $server);
-                    $usageAfter = $this->getFilesystemUsage($server);
-                    if ($usageAfter <  $this->usageBefore) {
-                        ray('Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $server->name)->color('orange');
-                        send_internal_notification('DockerCleanupJob done: Saved ' . ($this->usageBefore - $usageAfter) . '% disk space on ' . $server->name);
-                    } else {
-                        ray('DockerCleanupJob failed to save disk space on ' . $server->name)->color('orange');
-                    }
-                } else {
-                    ray('No need to clean up ' . $server->name)->color('orange');
+                    ray('DockerCleanupJob failed to save disk space on ' . $this->server->name)->color('orange');
                 }
+            } else {
+                ray('No need to clean up ' . $this->server->name)->color('orange');
             }
         } catch (\Throwable $e) {
             send_internal_notification('DockerCleanupJob failed with: ' . $e->getMessage());
@@ -83,8 +84,8 @@ class DockerCleanupJob implements ShouldQueue, ShouldBeEncrypted
         }
     }
 
-    private function getFilesystemUsage(Server $server)
+    private function getFilesystemUsage()
     {
-        return instant_remote_process(["df '{$this->dockerRootFilesystem}'| tail -1 | awk '{ print $5}' | sed 's/%//g'"], $server, false);
+        return instant_remote_process(["df '{$this->dockerRootFilesystem}'| tail -1 | awk '{ print $5}' | sed 's/%//g'"], $this->server, false);
     }
 }

app/Models/Application.php

@@ -226,9 +226,17 @@ class Application extends BaseModel
     }
     public function git_based(): bool
     {
-        if ($this->dockerfile || $this->build_pack === 'dockerfile' || $this->dockercompose || $this->build_pack === 'dockercompose') {
+        if ($this->dockerfile) {
             return false;
         }
         return true;
     }
+    public function isHealthcheckDisabled(): bool
+    {
+        if (data_get($this, 'dockerfile') || data_get($this, 'build_pack') === 'dockerfile' || data_get($this,'health_check_enabled') === false) {
+            ray('dockerfile');
+            return true;
+        }
+        return false;
+    }
 }

app/Models/GithubApp.php

@@ -6,6 +6,7 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
 
 class GithubApp extends BaseModel
 {
+
     protected $guarded = [];
     protected $appends = ['type'];
     protected $casts = [
@@ -17,6 +18,7 @@ class GithubApp extends BaseModel
         'webhook_secret',
     ];
 
+
     static public function public()
     {
         return GithubApp::whereTeamId(currentTeam()->id)->whereisPublic(true)->whereNotNull('app_id')->get();
@@ -34,6 +36,7 @@ class GithubApp extends BaseModel
             if ($applications_count > 0) {
                 throw new \Exception('You cannot delete this GitHub App because it is in use by ' . $applications_count . ' application(s). Delete them first.');
             }
+            $github_app->privateKey()->delete();
         });
     }
 

app/Models/LocalFileVolume.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Support\Str;
 
 class LocalFileVolume extends BaseModel
 {
@@ -13,4 +14,40 @@ class LocalFileVolume extends BaseModel
     {
         return $this->morphTo('resource');
     }
+    public function saveStorageOnServer(ServiceApplication|ServiceDatabase $service)
+    {
+        $workdir = $service->service->workdir();
+        $server = $service->service->server;
+        $commands = collect([
+            "mkdir -p $workdir > /dev/null 2>&1 || true",
+            "cd $workdir"
+        ]);
+        $fileVolume = $this;
+        $path = Str::of(data_get($fileVolume, 'fs_path'));
+        $content = data_get($fileVolume, 'content');
+        if ($path->startsWith('.')) {
+            $path = $path->after('.');
+            $path = $workdir . $path;
+        }
+        $isFile = instant_remote_process(["test -f $path && echo OK || echo NOK"], $server);
+        $isDir = instant_remote_process(["test -d $path && echo OK || echo NOK"], $server);
+        ray($isFile);
+        if ($isFile == 'OK' && $fileVolume->is_directory) {
+            throw new \Exception("File $path is a file on the server, but you are trying to mark it as a directory. Please delete the file on the server or mark it as directory.");
+        } else if ($isDir == 'OK' && !$fileVolume->is_directory) {
+            throw new \Exception("File $path is a directory on the server, but you are trying to mark it as a file. Please delete the directory on the server or mark it as directory.");
+        }
+        if (($isFile == 'NOK' && !$fileVolume->is_directory) || $isFile == 'OK') {
+            $rootDir = Str::of($path)->dirname();
+            $commands->push("mkdir -p $rootDir > /dev/null 2>&1 || true");
+            $commands->push("touch $path > /dev/null 2>&1 || true");
+            if ($content) {
+                $content = base64_encode($content);
+                $commands->push("echo '$content' | base64 -d > $path");
+            }
+        } else if ($isDir == 'NOK' && $fileVolume->is_directory) {
+            $commands->push("mkdir -p $path > /dev/null 2>&1 || true");
+        }
+        return instant_remote_process($commands, $server);
+    }
 }

app/Models/Service.php

@@ -196,6 +196,12 @@ class Service extends BaseModel
                     }
                 }
 
+                // Check if image changed
+                if ($savedService->image !== $image) {
+                    $savedService->image = $image;
+                    $savedService->save();
+                }
+
                 // Collect/create/update networks
                 if ($serviceNetworks->count() > 0) {
                     foreach ($serviceNetworks as $networkName => $networkDetails) {
@@ -306,7 +312,7 @@ class Service extends BaseModel
                                 ]
                             );
                         }
-                        $savedService->saveFileVolumes();
+                        $savedService->getFilesFromServer();
                     }
                 }
 
@@ -344,8 +350,7 @@ class Service extends BaseModel
                     }
                     if ($key->startsWith('SERVICE_FQDN')) {
                         if (is_null(data_get($savedService, 'fqdn'))) {
-                            $sslip = sslip($this->server);
-                            $fqdn = "http://$containerName.$sslip";
+                            $fqdn = generateFqdn($this->server, $containerName);
                             if (substr_count($key->value(), '_') === 2 && $key->contains("=")) {
                                 $path = $value->value();
                                 if ($generatedServiceFQDNS->count() > 0) {
@@ -358,7 +363,7 @@ class Service extends BaseModel
                                 } else {
                                     $generatedServiceFQDNS->put($key->value(), $fqdn);
                                 }
-                                $fqdn = "http://$containerName.$sslip$path";
+                                $fqdn = "$fqdn$path";
                             }
                             if (!$isDatabase) {
                                 $savedService->fqdn = $fqdn;
@@ -379,8 +384,7 @@ class Service extends BaseModel
                             $forService = $value->afterLast('_');
                             $generatedValue = null;
                             if ($command->value() === 'FQDN' || $command->value() === 'URL') {
-                                $sslip = sslip($this->server);
-                                $fqdn = "http://$containerName.$sslip";
+                                $fqdn = generateFqdn($this->server, $containerName);
                                 if ($foundEnv) {
                                     $fqdn = data_get($foundEnv, 'value');
                                 } else {

app/Models/ServiceApplication.php

@@ -36,8 +36,8 @@ class ServiceApplication extends BaseModel
 
         );
     }
-    public function saveFileVolumes()
+    public function getFilesFromServer()
     {
-        saveFileVolumesHelper($this);
+        getFilesystemVolumesFromServer($this);
     }
 }

app/Models/ServiceDatabase.php

@@ -26,8 +26,8 @@ class ServiceDatabase extends BaseModel
     {
         return $this->morphMany(LocalFileVolume::class, 'resource');
     }
-    public function saveFileVolumes()
+    public function getFilesFromServer()
     {
-        saveFileVolumesHelper($this);
+        getFilesystemVolumesFromServer($this);
     }
 }

bootstrap/helpers/docker.php

@@ -104,16 +104,16 @@ function getContainerStatus(Server $server, string $container_id, bool $all_data
     return data_get($container[0], 'State.Status', 'exited');
 }
 
-function generateApplicationContainerName(Application $application)
+function generateApplicationContainerName(Application $application, $pull_request_id = 0)
 {
     $now = now()->format('Hisu');
-    if ($application->pull_request_id !== 0 && $application->pull_request_id !== null) {
-        return $application->uuid . '-pr-' . $application->pull_request_id;
+    if ($pull_request_id !== 0 && $pull_request_id !== null) {
+        return $application->uuid . '-pr-' . $pull_request_id;
     } else {
         return $application->uuid . '-' . $now;
     }
 }
-function get_port_from_dockerfile($dockerfile): int
+function get_port_from_dockerfile($dockerfile): int|null
 {
     $dockerfile_array = explode("\n", $dockerfile);
     $found_exposed_port = null;
@@ -127,7 +127,7 @@ function get_port_from_dockerfile($dockerfile): int
     if ($found_exposed_port) {
         return (int)$found_exposed_port->value();
     }
-    return 80;
+    return null;
 }
 
 function defaultLabels($id, $name, $pull_request_id = 0, string $type = 'application', $subType = null, $subId = null)
@@ -207,10 +207,10 @@ function generateLabelsApplication(Application $application, ?ApplicationPreview
 {
 
     $pull_request_id = data_get($preview, 'pull_request_id', 0);
-    $container_name = generateApplicationContainerName($application);
+    $container_name = generateApplicationContainerName($application, $pull_request_id);
     $appId = $application->id;
-    if ($pull_request_id !== 0) {
-        $appId = $appId . '-pr-' . $application->pull_request_id;
+    if ($pull_request_id !== 0 && $pull_request_id !== null) {
+        $appId = $appId . '-pr-' . $pull_request_id;
     }
     $labels = collect([]);
     $labels = $labels->merge(defaultLabels($appId, $container_name, $pull_request_id));

bootstrap/helpers/services.php

@@ -64,40 +64,53 @@ function serviceStatus(Service $service)
     }
     return 'exited';
 }
-function saveFileVolumesHelper(ServiceApplication|ServiceDatabase $oneService)
+function getFilesystemVolumesFromServer(ServiceApplication|ServiceDatabase $oneService)
 {
+    // TODO: make this async
     try {
         $workdir = $oneService->service->workdir();
         $server = $oneService->service->server;
-        $applicationFileVolume = $oneService->fileStorages()->get();
+        $fileVolumes = $oneService->fileStorages()->get();
         $commands = collect([
             "mkdir -p $workdir > /dev/null 2>&1 || true",
-            "cd $workdir"
+            "cd "
         ]);
-        foreach ($applicationFileVolume as $fileVolume) {
-            $path = Str::of($fileVolume->fs_path);
-            if ($fileVolume->is_directory) {
-                $commands->push("test -f $path && rm -f $path > /dev/null 2>&1 || true");
-                $commands->push("mkdir -p $path > /dev/null 2>&1 || true");
-                continue;
+        instant_remote_process($commands, $server);
+        foreach ($fileVolumes as $fileVolume) {
+            $path = Str::of(data_get($fileVolume, 'fs_path'));
+            $content = data_get($fileVolume, 'content');
+            if ($path->startsWith('.')) {
+                $path = $path->after('.');
+                $fileLocation = $workdir . $path;
+            } else {
+                $fileLocation = $path;
             }
-            $content = $fileVolume->content;
-            $dir = $path->beforeLast('/');
-            if ($dir->startsWith('.')) {
-                $dir = $dir->after('.');
-                $dir = $workdir . $dir;
+            $isFile = instant_remote_process(["test -f $fileLocation && echo OK || echo NOK"], $server);
+            $isDir = instant_remote_process(["test -d $fileLocation && echo OK || echo NOK"], $server);
+            if ($isFile == 'OK' && !$fileVolume->is_directory) {
+                $filesystemContent = instant_remote_process(["cat $fileLocation"], $server);
+                if (base64_encode($filesystemContent) != base64_encode($content)) {
+                    $fileVolume->content = $filesystemContent;
+                    $fileVolume->save();
+                }
+            } else {
+                if ($isDir == 'OK') {
+                    $fileVolume->content = null;
+                    $fileVolume->is_directory = true;
+                    $fileVolume->save();
+                } else {
+                    $fileVolume->content = null;
+                    $fileVolume->is_directory = false;
+                    $fileVolume->save();
+                }
             }
-            $content = base64_encode($content);
-            $commands->push("test -d $path && rm -rf $path > /dev/null 2>&1 || true");
-            $commands->push("mkdir -p $dir > /dev/null 2>&1 || true");
-            $commands->push("echo '$content' | base64 -d > $path");
         }
-        return instant_remote_process($commands, $server);
     } catch (\Throwable $e) {
         return handleError($e);
     }
 }
-function updateCompose($resource) {
+function updateCompose($resource)
+{
     try {
         $name = data_get($resource, 'name');
         $dockerComposeRaw = data_get($resource, 'service.docker_compose_raw');
@@ -111,7 +124,7 @@ function updateCompose($resource) {
         $variableName = "SERVICE_FQDN_" . Str::of($resource->name)->upper();
         ray($variableName);
         $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
-        if ($generatedEnv){
+        if ($generatedEnv) {
             $generatedEnv->value = $resource->fqdn;
             $generatedEnv->save();
         }

bootstrap/helpers/shared.php

@@ -395,16 +395,29 @@ function data_get_str($data, $key, $default = null): Stringable
     return Str::of($str);
 }
 
+function generateFqdn(Server $server, string $random)
+{
+    $wildcard = data_get($server, 'settings.wildcard_domain');
+    if (is_null($wildcard) || $wildcard === '') {
+        $wildcard = sslip($server);
+    }
+    $url = Url::fromString($wildcard);
+    $host = $url->getHost();
+    $path = $url->getPath() === '/' ? '' : $url->getPath();
+    $scheme = $url->getScheme();
+    $finalFqdn = "$scheme://{$random}.$host$path" ;
+    return $finalFqdn;
+}
 function sslip(Server $server)
 {
     if (isDev()) {
-        return "127.0.0.1.sslip.io";
+        return "http://127.0.0.1.sslip.io";
     }
     if ($server->ip === 'host.docker.internal') {
         $baseIp = base_ip();
-        return "$baseIp.sslip.io";
+        return "http://$baseIp.sslip.io";
     }
-    return "{$server->ip}.sslip.io";
+    return "http://{$server->ip}.sslip.io";
 }
 
 function getServiceTemplates()

config/sentry.php

@@ -7,7 +7,7 @@ return [
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.50',
+    'release' => '4.0.0-beta.56',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/toaster.php

@@ -30,7 +30,7 @@ return [
      *
      * Minimum: 3000 (in milliseconds)
      */
-    'duration' => 3000,
+    'duration' => 5000,
 
     /**
      * The horizontal position of each toast.

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.50';
+return '4.0.0-beta.56';

database/migrations/2023_09_23_111815_add_healthcheck_disable_to_apps_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('applications', function (Blueprint $table) {
+            $table->boolean('health_check_enabled')->default(true);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('applications', function (Blueprint $table) {
+            $table->dropColumn('health_check_enabled');
+        });
+    }
+};

resources/views/components/applications/links.blade.php

@@ -3,7 +3,7 @@
         <x-chevron-down />
     </label>
 
-    <div class="absolute hidden group-hover:block">
+    <div class="absolute z-50 hidden group-hover:block">
         <ul tabindex="0" class="relative -ml-24 text-xs text-white normal-case rounded min-w-max menu bg-coolgray-200">
             @if (data_get($application, 'gitBrancLocation'))
                 <li>

resources/views/components/collapsible.blade.php

@@ -2,7 +2,7 @@
     <div tabindex="0" x-data="{ open: false }"
         class="transition border rounded cursor-pointer collapse collapse-arrow border-coolgray-200"
         :class="open ? 'collapse-open' : 'collapse-close'">
-        <div class="flex flex-col justify-center text-sm collapse-title" x-on:click="open = !open">
+        <div class="flex flex-col justify-center text-sm select-text collapse-title" x-on:click="open = !open">
             {{ $title }}
         </div>
         <div class="collapse-content">

resources/views/components/services/links.blade.php

@@ -4,7 +4,7 @@
             <x-chevron-down />
         </label>
 
-        <div class="absolute hidden group-hover:block">
+        <div class="absolute z-50 hidden group-hover:block">
             <ul tabindex="0"
                 class="relative -ml-24 text-xs text-white normal-case rounded min-w-max menu bg-coolgray-200">
                 @if ($links->count() > 0)

resources/views/livewire/project/application/general.blade.php

@@ -15,16 +15,8 @@
             <div class="flex items-end gap-2">
                 <x-forms.input placeholder="https://coolify.io" id="application.fqdn" label="Domains"
                     helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io, https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. " />
-                @if ($wildcard_domain)
-                    @if ($global_wildcard_domain)
-                        <x-forms.button wire:click="generateGlobalRandomDomain">Set Global Wildcard
-                        </x-forms.button>
-                    @endif
-                    @if ($server_wildcard_domain)
-                        <x-forms.button wire:click="generateServerRandomDomain">Set Server Wildcard
-                        </x-forms.button>
-                    @endif
-                @endif
+                    <x-forms.button wire:click="getWildcardDomain">Generate Domain
+                    </x-forms.button>
             </div>
             @if (!$application->dockerfile)
                 <div class="flex items-end gap-2">
@@ -89,7 +81,7 @@
                     id="is_auto_deploy_enabled" label="Auto Deploy" />
                 <x-forms.checkbox
                     helper="Allow to automatically deploy Preview Deployments for all opened PR's.<br><br>Closing a PR will delete Preview Deployments."
-                    instantSave id="is_preview_deployments_enabled" label="Previews Deployments" />
+                    instantSave id="is_preview_deployments_enabled" label="Preview Deployments" />
 
                 <x-forms.checkbox instantSave id="is_git_submodules_enabled" label="Git Submodules"
                     helper="Allow Git Submodules during build process." />

resources/views/livewire/project/application/preview/form.blade.php

@@ -1,6 +1,6 @@
 <form wire:submit.prevent='submit'>
     <div class="flex items-center gap-2">
-        <h2>Previews Deployments</h2>
+        <h2>Preview Deployments</h2>
         <x-forms.button type="submit">Save</x-forms.button>
         <x-forms.button wire:click="resetToDefault">Reset template to default</x-forms.button>
     </div>

resources/views/livewire/project/application/previews.blade.php

@@ -54,11 +54,11 @@
                 <div class="flex flex-col p-4 bg-coolgray-200">
                     <div class="flex gap-2">PR #{{ data_get($preview, 'pull_request_id') }} |
                         @if (Str::of(data_get($preview, 'status'))->startsWith('running'))
-                            <x-status.running :status="$status" />
+                            <x-status.running :status="data_get($preview, 'status')" />
                         @elseif(Str::of(data_get($preview, 'status'))->startsWith('restarting'))
-                            <x-status.restarting :status="$status" />
+                            <x-status.restarting :status="data_get($preview, 'status')" />
                         @else
-                            <x-status.stopped :status="$status" />
+                            <x-status.stopped :status="data_get($preview, 'status')" />
                         @endif
                         @if (data_get($preview, 'status') !== 'exited')
                             | <a target="_blank" href="{{ data_get($preview, 'fqdn') }}">Open Preview

resources/views/livewire/project/service/compose-modal.blade.php

@@ -0,0 +1,26 @@
+<dialog id="composeModal" class="modal" x-data="{ raw: true }">
+    <form method="dialog" class="flex flex-col gap-2 rounded max-w-7xl modal-box" wire:submit.prevent='submit'>
+        <h1>Docker Compose</h1>
+        <div x-cloak x-show="raw">
+            <x-forms.button class="w-64" @click.prevent="raw = !raw">Check Deployable Compose</x-forms.button>
+        </div>
+        <div x-cloak x-show="raw === false">
+            <x-forms.button class="w-64" @click.prevent="raw = !raw">Show Source
+                Compose</x-forms.button>
+        </div>
+        <div x-cloak x-show="raw">
+            <x-forms.textarea rows="20" id="raw">
+            </x-forms.textarea>
+        </div>
+        <div x-cloak x-show="raw === false">
+            <x-forms.textarea rows="20" readonly id="actual">
+            </x-forms.textarea>
+        </div>
+        <x-forms.button onclick="composeModal.close()" type="submit">
+            Save
+        </x-forms.button>
+    </form>
+    <form method="dialog" class="modal-backdrop">
+        <button>close</button>
+    </form>
+</dialog>

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

@@ -1,23 +1,25 @@
 <x-collapsible>
     <x-slot:title>
-        <div>{{ $fileStorage->mount_path }} </div>
+        <div>{{$workdir}}{{ $fs_path }} -> {{ $fileStorage->mount_path }}</div>
     </x-slot:title>
     <x-slot:action>
         <form wire:submit.prevent='submit' class="flex flex-col gap-2">
             <div class="w-64">
                 <x-forms.checkbox instantSave label="Is directory?" id="fileStorage.is_directory"></x-forms.checkbox>
             </div>
-            @if ($fileStorage->is_directory)
+            {{-- @if ($fileStorage->is_directory)
                 <x-forms.input readonly label="Directory on Filesystem (save files here)" id="fs_path"></x-forms.input>
-            @else
-                <div class="flex gap-2">
+            @else --}}
+            {{-- <div class="flex gap-2">
                     <x-forms.input readonly label="File in Docker Compose file" id="fileStorage.fs_path"></x-forms.input>
                     <x-forms.input readonly label="File on Filesystem (save files here)" id="fs_path"></x-forms.input>
                 </div>
-                <x-forms.input readonly label="Mount (in container)" id="fileStorage.mount_path"></x-forms.input>
+                <x-forms.input readonly label="Mount (in container)" id="fileStorage.mount_path"></x-forms.input> --}}
+            @if (!$fileStorage->is_directory)
                 <x-forms.textarea label="Content" rows="20" id="fileStorage.content"></x-forms.textarea>
                 <x-forms.button type="submit">Save</x-forms.button>
             @endif
+            {{-- @endif --}}
         </form>
     </x-slot:action>
 </x-collapsible>

resources/views/livewire/project/service/index.blade.php

@@ -1,5 +1,6 @@
 <div x-data="{ raw: true, activeTab: window.location.hash ? window.location.hash.substring(1) : 'service-stack' }" wire:poll.10000ms="checkStatus">
     <livewire:project.service.navbar :service="$service" :parameters="$parameters" :query="$query" />
+    <livewire:project.service.compose-modal :raw="$service->docker_compose_raw" :actual="$service->docker_compose" />
     <div class="flex h-full pt-6">
         <div class="flex flex-col items-start gap-4 min-w-fit">
             <a target="_blank" href="{{ $service->documentation() }}">Documentation <x-external-link /></a>
@@ -23,39 +24,13 @@
                             <div>Configuration</div>
                         </div>
                         <x-forms.button type="submit">Save</x-forms.button>
-                        <div x-cloak x-show="raw">
-                            <x-forms.button class="w-64" @click.prevent="raw = !raw">Show Deployable
-                                Compose</x-forms.button>
-                        </div>
-                        <div x-cloak x-show="raw === false">
-                            <x-forms.button class="w-64" @click.prevent="raw = !raw">Show Source
-                                Compose</x-forms.button>
-                        </div>
-
+                        <x-forms.button class="w-64" onclick="composeModal.showModal()">Edit Compose File</x-forms.button>
                     </div>
                     <div class="flex gap-2">
                         <x-forms.input id="service.name" required label="Service Name"
                             placeholder="My super wordpress site" />
                         <x-forms.input id="service.description" label="Description" />
                     </div>
-                    <div x-cloak x-show="raw">
-                        <x-forms.textarea label="Docker Compose file"
-                            helper="
-                        You can use these variables in your Docker Compose file and Coolify will generate default values or replace them with the values you set on the UI forms.<br>
-                        <br>
-                        - SERVICE_FQDN_*: FQDN - could be changable from the UI. (example: SERVICE_FQDN_GHOST)<br>
-                        - SERVICE_URL_*: URL parsed from FQDN - could be changable from the UI. (example: SERVICE_URL_GHOST)<br>
-                        - SERVICE_BASE64_64_*: Generated 'base64' string with length of '64' (example: SERVICE_BASE64_64_GHOST, to generate 32 bit: SERVICE_BASE64_32_GHOST)<br>
-                        - SERVICE_USER_*: Generated user (example: SERVICE_USER_MYSQL)<br>
-                        - SERVICE_PASSWORD_*: Generated password (example: SERVICE_PASSWORD_MYSQL)<br>"
-                            rows="6" id="service.docker_compose_raw">
-                        </x-forms.textarea>
-                    </div>
-                    <div x-cloak x-show="raw === false">
-                        <x-forms.textarea label="Actual Docker Compose file that will be deployed" readonly
-                            rows="6" id="service.docker_compose">
-                        </x-forms.textarea>
-                    </div>
                 </form>
                 <div class="grid grid-cols-1 gap-2 pt-4 xl:grid-cols-3">
                     @foreach ($service->applications as $application)

resources/views/livewire/project/service/show.blade.php

@@ -22,7 +22,7 @@
                     @if ($serviceApplication->fileStorages()->get()->count() > 0)
                         <h3 class="py-4">Mounted Files (binds)</h3>
                         <div class="flex flex-col gap-4">
-                            @foreach ($serviceApplication->fileStorages()->get() as $fileStorage)
+                            @foreach ($serviceApplication->fileStorages()->get()->sort() as $fileStorage)
                                 <livewire:project.service.file-storage :fileStorage="$fileStorage" wire:key="{{ $loop->index }}" />
                             @endforeach
                         </div>
@@ -39,7 +39,7 @@
                     @if ($serviceDatabase->fileStorages()->get()->count() > 0)
                         <h3 class="py-4">Mounted Files (binds)</h3>
                         <div class="flex flex-col gap-4">
-                            @foreach ($serviceDatabase->fileStorages()->get() as $fileStorage)
+                            @foreach ($serviceDatabase->fileStorages()->get()->sort() as $fileStorage)
                                 <livewire:project.service.file-storage :fileStorage="$fileStorage" wire:key="{{ $loop->index }}" />
                             @endforeach
                         </div>

resources/views/livewire/project/shared/health-checks.blade.php

@@ -5,24 +5,27 @@
     </div>
     <div class="pb-4">Define how your resource's health should be checked.</div>
     <div class="flex flex-col gap-4">
-    <div class="flex gap-2">
-        <x-forms.input id="resource.health_check_method" placeholder="GET" label="Method" required />
+        <div class="w-32">
+            <x-forms.checkbox instantSave id="resource.health_check_enabled" label="Enabled" />
+        </div>
+        <div class="flex gap-2">
+            <x-forms.input id="resource.health_check_method" placeholder="GET" label="Method" required />
 
-        <x-forms.input id="resource.health_check_scheme" placeholder="http" label="Scheme" required />
-        <x-forms.input id="resource.health_check_host" placeholder="localhost" label="Host" required />
-        <x-forms.input id="resource.health_check_port"
-            helper="If no port is defined, the first exposed port will be used." placeholder="80" label="Port" />
-        <x-forms.input id="resource.health_check_path" placeholder="/health" label="Path" required />
+            <x-forms.input id="resource.health_check_scheme" placeholder="http" label="Scheme" required />
+            <x-forms.input id="resource.health_check_host" placeholder="localhost" label="Host" required />
+            <x-forms.input id="resource.health_check_port"
+                helper="If no port is defined, the first exposed port will be used." placeholder="80" label="Port" />
+            <x-forms.input id="resource.health_check_path" placeholder="/health" label="Path" required />
+        </div>
+        <div class="flex gap-2">
+            <x-forms.input id="resource.health_check_return_code" placeholder="200" label="Return Code" required />
+            <x-forms.input id="resource.health_check_response_text" placeholder="OK" label="Response Text" />
+        </div>
+        <div class="flex gap-2">
+            <x-forms.input id="resource.health_check_interval" placeholder="30" label="Interval" required />
+            <x-forms.input id="resource.health_check_timeout" placeholder="30" label="Timeout" required />
+            <x-forms.input id="resource.health_check_retries" placeholder="3" label="Retries" required />
+            <x-forms.input id="resource.health_check_start_period" placeholder="30" label="Start Period" required />
+        </div>
     </div>
-    <div class="flex gap-2">
-        <x-forms.input id="resource.health_check_return_code" placeholder="200" label="Return Code" required />
-        <x-forms.input id="resource.health_check_response_text" placeholder="OK" label="Response Text" />
-    </div>
-    <div class="flex gap-2">
-        <x-forms.input id="resource.health_check_interval" placeholder="30" label="Interval" required />
-        <x-forms.input id="resource.health_check_timeout" placeholder="30" label="Timeout" required />
-        <x-forms.input id="resource.health_check_retries" placeholder="3" label="Retries" required />
-        <x-forms.input id="resource.health_check_start_period" placeholder="30" label="Start Period" required />
-    </div>
-</div>
 </form>

resources/views/project/application/configuration.blade.php

@@ -22,7 +22,7 @@
             </a>
             @if ($application->git_based())
                 <a :class="activeTab === 'previews' && 'text-white'"
-                    @click.prevent="activeTab = 'previews'; window.location.hash = 'previews'" href="#">Previews
+                    @click.prevent="activeTab = 'previews'; window.location.hash = 'previews'" href="#">Preview
                     Deployments
                 </a>
             @endif

routes/web.php

@@ -99,7 +99,7 @@ Route::middleware(['auth'])->group(function () {
     ]))->name('server.proxy');
     Route::get('/server/{server_uuid}/private-key', fn () => view('server.private-key', [
         'server' => Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->firstOrFail(),
-        'privateKeys' => PrivateKey::ownedByCurrentTeam()->get(),
+        'privateKeys' => PrivateKey::ownedByCurrentTeam()->get()->where('is_git_related', false),
     ]))->name('server.private-key');
     Route::get('/server/{server_uuid}/destinations', fn () => view('server.destinations', [
         'server' => Server::ownedByCurrentTeam(['name', 'proxy'])->whereUuid(request()->server_uuid)->firstOrFail()
@@ -133,7 +133,7 @@ Route::middleware(['auth'])->group(function () {
 Route::middleware(['auth'])->group(function () {
     Route::get('/security', fn () => view('security.index'))->name('security.index');
     Route::get('/security/private-key', fn () => view('security.private-key.index', [
-        'privateKeys' => PrivateKey::ownedByCurrentTeam(['name', 'uuid', 'is_git_related'])->where('is_git_related', false)->get()
+        'privateKeys' => PrivateKey::ownedByCurrentTeam(['name', 'uuid', 'is_git_related'])->get()
     ]))->name('security.private-key.index');
     Route::get('/security/private-key/new', fn () => view('security.private-key.new'))->name('security.private-key.new');
     Route::get('/security/private-key/{private_key_uuid}', fn () => view('security.private-key.show', [

routes/webhooks.php

@@ -111,13 +111,17 @@ Route::post('/source/github/events', function () {
         $applications = Application::where('repository_project_id', $id)->whereRelation('source', 'is_public', false);
         if ($x_github_event === 'push') {
             $applications = $applications->where('git_branch', $branch)->get();
+            if ($applications->isEmpty()) {
+                return response("Nothing to do. No applications found with branch '$branch'.");
+            }
         }
         if ($x_github_event === 'pull_request') {
             $applications = $applications->where('git_branch', $base_branch)->get();
+            if ($applications->isEmpty()) {
+                return response("Nothing to do. No applications found with branch '$base_branch'.");
+            }
         }
-        if ($applications->isEmpty()) {
-            return response("Nothing to do. No applications found with branch '$base_branch'.");
-        }
+
         foreach ($applications as $application) {
             $isFunctional = $application->destination->server->isFunctional();
             if (!$isFunctional) {
@@ -168,9 +172,9 @@ Route::post('/source/github/events', function () {
                     $found = ApplicationPreview::where('application_id', $application->id)->where('pull_request_id', $pull_request_id)->first();
                     if ($found) {
                         $found->delete();
-                        $container_name = generateApplicationContainerName($application);
-                        ray('Stopping container: ' . $container_name);
-                        remote_process(["docker rm -f $container_name"], $application->destination->server);
+                        $container_name = generateApplicationContainerName($application,$pull_request_id);
+                        // ray('Stopping container: ' . $container_name);
+                        instant_remote_process(["docker rm -f $container_name"], $application->destination->server);
                         return response('Preview Deployment closed.');
                     }
                     return response('Nothing to do. No Preview Deployment found');
@@ -323,7 +327,7 @@ Route::post('/payments/stripe/events', function () {
                 }
                 if ($alreadyCancelAtPeriodEnd !== $cancelAtPeriodEnd) {
                     if ($cancelAtPeriodEnd) {
-                        send_internal_notification('Subscription cancelled at period end for team: ' . $subscription->team->id);
+                        // send_internal_notification('Subscription cancelled at period end for team: ' . $subscription->team->id);
                     } else {
                         send_internal_notification('Subscription resumed for team: ' . $subscription->team->id);
                     }
@@ -342,7 +346,7 @@ Route::post('/payments/stripe/events', function () {
                     'stripe_invoice_paid' => false,
                     'stripe_trial_already_ended' => true,
                 ]);
-                send_internal_notification('Subscription cancelled: ' . $subscription->team->id);
+                // send_internal_notification('Subscription cancelled: ' . $subscription->team->id);
                 break;
             case 'customer.subscription.trial_will_end':
                 $customerId = data_get($data, 'customer');

templates/deprecated.json

@@ -0,0 +1,7 @@
+{
+    "plausible-analytics": {
+        "documentation": "https://plausible.io/docs",
+        "slogan": "A lighweight and open-source website analytics tool.",
+        "compose": "dmVyc2lvbjogIjMuMyIKc2VydmljZXM6CiAgcGxhdXNpYmxlLWFuYWx5dGljczoKICAgIGltYWdlOiBwbGF1c2libGUvYW5hbHl0aWNzOnYyLjAKICAgIGNvbW1hbmQ6IHNoIC1jICJzbGVlcCAxMCAmJiAvZW50cnlwb2ludC5zaCBkYiBjcmVhdGVkYiAmJiAvZW50cnlwb2ludC5zaCBkYiBtaWdyYXRlICYmIC9lbnRyeXBvaW50LnNoIHJ1biIKICAgIGVudmlyb25tZW50OgogICAgICAtIERBVEFCQVNFX1VSTD1wb3N0Z3JlczovL3Bvc3RncmVzOiRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTQHBsYXVzaWJsZV9kYi9wbGF1c2libGUKICAgICAgLSBCQVNFX1VSTD0kU0VSVklDRV9GUUROX1BMQVVTSUJMRQogICAgICAtIFNFQ1JFVF9LRVlfQkFTRT0kU0VSVklDRV9CQVNFNjRfNjRfUExBVVNJQkxFCiAgICBkZXBlbmRzX29uOgogICAgICAtIHBsYXVzaWJsZV9kYgogICAgICAtIHBsYXVzaWJsZV9ldmVudHNfZGIKICAgICAgLSBtYWlsCgogIG1haWw6CiAgICBpbWFnZTogYnl0ZW1hcmsvc210cAoKICBwbGF1c2libGVfZGI6CiAgICBpbWFnZTogcG9zdGdyZXM6MTQtYWxwaW5lCiAgICB2b2x1bWVzOgogICAgICAtIGRiLWRhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBQT1NUR1JFU19EQj1wbGF1c2libGUKICAgICAgLSBQT1NUR1JFU19QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwoKICBwbGF1c2libGVfZXZlbnRzX2RiOgogICAgaW1hZ2U6IGNsaWNraG91c2UvY2xpY2tob3VzZS1zZXJ2ZXI6MjMuMy43LjUtYWxwaW5lCiAgICB2b2x1bWVzOgogICAgICAtIHR5cGU6IHZvbHVtZQogICAgICAgIHNvdXJjZTogZXZlbnQtZGF0YQogICAgICAgIHRhcmdldDogL3Zhci9saWIvY2xpY2tob3VzZQogICAgICAtIHR5cGU6IGJpbmQKICAgICAgICBzb3VyY2U6IC4vY2xpY2tob3VzZS9jbGlja2hvdXNlLWNvbmZpZy54bWwKICAgICAgICB0YXJnZXQ6IC9ldGMvY2xpY2tob3VzZS1zZXJ2ZXIvY29uZmlnLmQvbG9nZ2luZy54bWwKICAgICAgICByZWFkX29ubHk6IHRydWUKICAgICAgICBjb250ZW50OiA+LQogICAgICAgICAgPGNsaWNraG91c2U+PHByb2ZpbGVzPjxkZWZhdWx0Pjxsb2dfcXVlcmllcz4wPC9sb2dfcXVlcmllcz48bG9nX3F1ZXJ5X3RocmVhZHM+MDwvbG9nX3F1ZXJ5X3RocmVhZHM+PC9kZWZhdWx0PjwvcHJvZmlsZXM+PC9jbGlja2hvdXNlPgogICAgICAtIHR5cGU6IGJpbmQKICAgICAgICBzb3VyY2U6IC4vY2xpY2tob3VzZS9jbGlja2hvdXNlLXVzZXItY29uZmlnLnhtbAogICAgICAgIHRhcmdldDogL2V0Yy9jbGlja2hvdXNlLXNlcnZlci91c2Vycy5kL2xvZ2dpbmcueG1sCiAgICAgICAgcmVhZF9vbmx5OiB0cnVlCiAgICAgICAgY29udGVudDogPi0KICAgICAgICAgIDxjbGlja2hvdXNlPjxsb2dnZXI+PGxldmVsPndhcm5pbmc8L2xldmVsPjxjb25zb2xlPnRydWU8L2NvbnNvbGU+PC9sb2dnZXI+PHF1ZXJ5X3RocmVhZF9sb2cKICAgICAgICAgIHJlbW92ZT0icmVtb3ZlIi8+PHF1ZXJ5X2xvZyByZW1vdmU9InJlbW92ZSIvPjx0ZXh0X2xvZwogICAgICAgICAgcmVtb3ZlPSJyZW1vdmUiLz48dHJhY2VfbG9nIHJlbW92ZT0icmVtb3ZlIi8+PG1ldHJpY19sb2cKICAgICAgICAgIHJlbW92ZT0icmVtb3ZlIi8+PGFzeW5jaHJvbm91c19tZXRyaWNfbG9nCiAgICAgICAgICByZW1vdmU9InJlbW92ZSIvPjxzZXNzaW9uX2xvZyByZW1vdmU9InJlbW92ZSIvPjxwYXJ0X2xvZwogICAgICAgICAgcmVtb3ZlPSJyZW1vdmUiLz48L2NsaWNraG91c2U+CiAgICB1bGltaXRzOgogICAgICBub2ZpbGU6CiAgICAgICAgc29mdDogMjYyMTQ0CiAgICAgICAgaGFyZDogMjYyMTQ0Cg=="
+    },
+}

templates/service-templates.json

@@ -1,9 +1,4 @@
 {
-    "plausible-analytics": {
-        "documentation": "https://plausible.io/docs",
-        "slogan": "A lighweight and open-source website analytics tool.",
-        "compose": "dmVyc2lvbjogIjMuMyIKc2VydmljZXM6CiAgcGxhdXNpYmxlLWFuYWx5dGljczoKICAgIGltYWdlOiBwbGF1c2libGUvYW5hbHl0aWNzOnYyLjAKICAgIGNvbW1hbmQ6IHNoIC1jICJzbGVlcCAxMCAmJiAvZW50cnlwb2ludC5zaCBkYiBjcmVhdGVkYiAmJiAvZW50cnlwb2ludC5zaCBkYiBtaWdyYXRlICYmIC9lbnRyeXBvaW50LnNoIHJ1biIKICAgIGVudmlyb25tZW50OgogICAgICAtIERBVEFCQVNFX1VSTD1wb3N0Z3JlczovL3Bvc3RncmVzOiRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTQHBsYXVzaWJsZV9kYi9wbGF1c2libGUKICAgICAgLSBCQVNFX1VSTD0kU0VSVklDRV9GUUROX1BMQVVTSUJMRQogICAgICAtIFNFQ1JFVF9LRVlfQkFTRT0kU0VSVklDRV9CQVNFNjRfNjRfUExBVVNJQkxFCiAgICBkZXBlbmRzX29uOgogICAgICAtIHBsYXVzaWJsZV9kYgogICAgICAtIHBsYXVzaWJsZV9ldmVudHNfZGIKICAgICAgLSBtYWlsCgogIG1haWw6CiAgICBpbWFnZTogYnl0ZW1hcmsvc210cAoKICBwbGF1c2libGVfZGI6CiAgICBpbWFnZTogcG9zdGdyZXM6MTQtYWxwaW5lCiAgICB2b2x1bWVzOgogICAgICAtIGRiLWRhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBQT1NUR1JFU19EQj1wbGF1c2libGUKICAgICAgLSBQT1NUR1JFU19QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwoKICBwbGF1c2libGVfZXZlbnRzX2RiOgogICAgaW1hZ2U6IGNsaWNraG91c2UvY2xpY2tob3VzZS1zZXJ2ZXI6MjMuMy43LjUtYWxwaW5lCiAgICB2b2x1bWVzOgogICAgICAtIHR5cGU6IHZvbHVtZQogICAgICAgIHNvdXJjZTogZXZlbnQtZGF0YQogICAgICAgIHRhcmdldDogL3Zhci9saWIvY2xpY2tob3VzZQogICAgICAtIHR5cGU6IGJpbmQKICAgICAgICBzb3VyY2U6IC4vY2xpY2tob3VzZS9jbGlja2hvdXNlLWNvbmZpZy54bWwKICAgICAgICB0YXJnZXQ6IC9ldGMvY2xpY2tob3VzZS1zZXJ2ZXIvY29uZmlnLmQvbG9nZ2luZy54bWwKICAgICAgICByZWFkX29ubHk6IHRydWUKICAgICAgICBjb250ZW50OiA+LQogICAgICAgICAgPGNsaWNraG91c2U+PHByb2ZpbGVzPjxkZWZhdWx0Pjxsb2dfcXVlcmllcz4wPC9sb2dfcXVlcmllcz48bG9nX3F1ZXJ5X3RocmVhZHM+MDwvbG9nX3F1ZXJ5X3RocmVhZHM+PC9kZWZhdWx0PjwvcHJvZmlsZXM+PC9jbGlja2hvdXNlPgogICAgICAtIHR5cGU6IGJpbmQKICAgICAgICBzb3VyY2U6IC4vY2xpY2tob3VzZS9jbGlja2hvdXNlLXVzZXItY29uZmlnLnhtbAogICAgICAgIHRhcmdldDogL2V0Yy9jbGlja2hvdXNlLXNlcnZlci91c2Vycy5kL2xvZ2dpbmcueG1sCiAgICAgICAgcmVhZF9vbmx5OiB0cnVlCiAgICAgICAgY29udGVudDogPi0KICAgICAgICAgIDxjbGlja2hvdXNlPjxsb2dnZXI+PGxldmVsPndhcm5pbmc8L2xldmVsPjxjb25zb2xlPnRydWU8L2NvbnNvbGU+PC9sb2dnZXI+PHF1ZXJ5X3RocmVhZF9sb2cKICAgICAgICAgIHJlbW92ZT0icmVtb3ZlIi8+PHF1ZXJ5X2xvZyByZW1vdmU9InJlbW92ZSIvPjx0ZXh0X2xvZwogICAgICAgICAgcmVtb3ZlPSJyZW1vdmUiLz48dHJhY2VfbG9nIHJlbW92ZT0icmVtb3ZlIi8+PG1ldHJpY19sb2cKICAgICAgICAgIHJlbW92ZT0icmVtb3ZlIi8+PGFzeW5jaHJvbm91c19tZXRyaWNfbG9nCiAgICAgICAgICByZW1vdmU9InJlbW92ZSIvPjxzZXNzaW9uX2xvZyByZW1vdmU9InJlbW92ZSIvPjxwYXJ0X2xvZwogICAgICAgICAgcmVtb3ZlPSJyZW1vdmUiLz48L2NsaWNraG91c2U+CiAgICB1bGltaXRzOgogICAgICBub2ZpbGU6CiAgICAgICAgc29mdDogMjYyMTQ0CiAgICAgICAgaGFyZDogMjYyMTQ0Cg=="
-    },
     "umami": {
         "documentation": "https://umami.is/docs/getting-started",
         "slogan": "Umami makes it easy to collect, analyze, and understand your web data — while maintaining visitor privacy and data ownership.",

versions.json

@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.50"
+            "version": "4.0.0-beta.56"
         }
     }
 }