Merge pull request #1338 from coollabsio/next

v4.0.0-beta.92

app/Actions/Database/StartDatabaseProxy.php

@@ -87,7 +87,7 @@ class StartDatabaseProxy
             "echo '{$dockerfile_base64}' | base64 -d > $configuration_dir/Dockerfile",
             "echo '{$nginxconf_base64}' | base64 -d > $configuration_dir/nginx.conf",
             "echo '{$dockercompose_base64}' | base64 -d > $configuration_dir/docker-compose.yaml",
-            "docker compose --project-directory {$configuration_dir} up --build -d >/dev/null",
+            "docker compose --project-directory {$configuration_dir} up --build -d",
         ], $database->destination->server);
     }
 }

app/Actions/Proxy/CheckProxy.php

@@ -2,41 +2,50 @@
 
 namespace App\Actions\Proxy;
 
-use App\Enums\ProxyTypes;
 use App\Models\Server;
-use Illuminate\Support\Str;
 use Lorisleiva\Actions\Concerns\AsAction;
-use Spatie\Activitylog\Models\Activity;
 
 class CheckProxy
 {
     use AsAction;
-    public function handle(Server $server)
+    public function handle(Server $server, $fromUI = false)
     {
         if (!$server->isProxyShouldRun()) {
-            throw new \Exception("Proxy should not run");
+            if ($fromUI) {
+                throw new \Exception("Proxy should not run. You selected the Custom Proxy.");
+            } else {
+                return false;
+            }
         }
         $status = getContainerStatus($server, 'coolify-proxy');
         if ($status === 'running') {
             $server->proxy->set('status', 'running');
             $server->save();
-            return 'OK';
+            return false;
         }
         $ip = $server->ip;
         if ($server->id === 0) {
             $ip = 'host.docker.internal';
         }
 
-        $connection = @fsockopen($ip, '80');
+        $connection80 = @fsockopen($ip, '80');
-        $connection = @fsockopen($ip, '443');
+        $connection443 = @fsockopen($ip, '443');
-        $port80 = is_resource($connection) && fclose($connection);
+        $port80 = is_resource($connection80) && fclose($connection80);
-        $port443 = is_resource($connection) && fclose($connection);
+        $port443 = is_resource($connection443) && fclose($connection443);
-        ray($ip);
         if ($port80) {
-            throw new \Exception("Port 80 is in use.<br>You must stop the process using this port.<br>Docs: <a target='_blank' href='https://coolify.io/docs'>https://coolify.io/docs</a> <br> Discord: <a target='_blank'  href='https://coollabs.io/discord'>https://coollabs.io/discord</a>");
+            if ($fromUI) {
+                throw new \Exception("Port 80 is in use.<br>You must stop the process using this port.<br>Docs: <a target='_blank' href='https://coolify.io/docs'>https://coolify.io/docs</a> <br> Discord: <a target='_blank'  href='https://coollabs.io/discord'>https://coollabs.io/discord</a>");
+            } else {
+                return false;
+            }
         }
         if ($port443) {
-            throw new \Exception("Port 443 is in use.<br>You must stop the process using this port.<br>Docs: <a target='_blank' href='https://coolify.io/docs'>https://coolify.io/docs</a> <br> Discord: <a target='_blank'  href='https://coollabs.io/discord'>https://coollabs.io/discord</a>>");
+            if ($fromUI) {
+                throw new \Exception("Port 443 is in use.<br>You must stop the process using this port.<br>Docs: <a target='_blank' href='https://coolify.io/docs'>https://coolify.io/docs</a> <br> Discord: <a target='_blank'  href='https://coollabs.io/discord'>https://coollabs.io/discord</a>");
+            } else {
+                return false;
+            }
         }
+        return true;
     }
 }

app/Actions/Proxy/StartProxy.php

@@ -13,8 +13,6 @@ class StartProxy
     public function handle(Server $server, bool $async = true): string|Activity
     {
         try {
-            CheckProxy::run($server);
-
             $proxyType = $server->proxyType();
             $commands = collect([]);
             $proxy_path = get_proxy_path();

app/Console/Kernel.php

@@ -28,6 +28,7 @@ class Kernel extends ConsoleKernel
             // $this->check_scheduled_backups($schedule);
             $this->check_resources($schedule);
             $this->cleanup_servers($schedule);
+            $this->check_scheduled_backups($schedule);
         } else {
             $schedule->command('horizon:snapshot')->everyFiveMinutes();
             $schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer();

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

@@ -60,12 +60,16 @@ class DeploymentNavbar extends Component
                 $previous_logs[] = $new_log_entry;
                 $this->application_deployment_queue->update([
                     'logs' => json_encode($previous_logs, flags: JSON_THROW_ON_ERROR),
-                    'current_process_id' => null,
-                    'status' => ApplicationDeploymentStatus::CANCELLED_BY_USER->value,
                 ]);
             }
         } catch (\Throwable $e) {
             return handleError($e, $this);
+        } finally {
+            $this->application_deployment_queue->update([
+                'current_process_id' => null,
+                'status' => ApplicationDeploymentStatus::CANCELLED_BY_USER->value,
+            ]);
+            queue_next_deployment($this->application);
         }
     }
 }

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

@@ -34,5 +34,6 @@ class Navbar extends Component
         StopService::run($this->service);
         $this->service->refresh();
         $this->emit('success', 'Service stopped successfully.');
+        $this->checkStatus();
     }
 }

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

@@ -6,6 +6,7 @@ use Livewire\Component;
 
 class StackForm extends Component
 {
+    public $service;
     protected $listeners = ["saveCompose"];
     protected $rules = [
         'service.docker_compose_raw' => 'required',
@@ -13,7 +14,6 @@ class StackForm extends Component
         'service.name' => 'required',
         'service.description' => 'nullable',
     ];
-    public $service;
     public function saveCompose($raw)
     {
         $this->service->docker_compose_raw = $raw;

app/Http/Livewire/Server/Proxy/Deploy.php

@@ -39,7 +39,7 @@ class Deploy extends Component
     public function checkProxy()
     {
         try {
-            CheckProxy::run($this->server);
+            CheckProxy::run($this->server, true);
             $this->emit('startProxyPolling');
             $this->emit('proxyChecked');
         } catch (\Throwable $e) {

app/Http/Livewire/Server/Proxy/Status.php

@@ -34,7 +34,7 @@ class Status extends Component
                 }
                 $this->numberOfPolls++;
             }
-            CheckProxy::run($this->server);
+            CheckProxy::run($this->server, true);
             $this->emit('proxyStatusUpdated');
             if ($this->server->proxy->status === 'running') {
                 $this->polling = false;

app/Jobs/ApplicationDeploymentJob.php

@@ -67,10 +67,14 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private $docker_compose;
     private $docker_compose_base64;
     private string $dockerfile_location = '/Dockerfile';
-
+    private ?string $addHosts = null;
     private $log_model;
     private Collection $saved_outputs;
 
+    private string $serverUser = 'root';
+    private string $serverUserHomeDir = '/root';
+    private string $dockerConfigFileExists = 'NOK';
+
     public $tries = 1;
     public function __construct(int $application_deployment_queue_id)
     {
@@ -92,13 +96,12 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         }
         $this->destination = $this->application->destination->getMorphClass()::where('id', $this->application->destination->id)->first();
         $this->server = $this->destination->server;
-
+        $this->serverUser = $this->server->user;
         $this->basedir = "/artifacts/{$this->deployment_uuid}";
         $this->workdir = "{$this->basedir}" . rtrim($this->application->base_directory, '/');
         $this->configuration_dir = application_configuration_dir() . "/{$this->application->uuid}";
         $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
 
-        ray($this->basedir, $this->workdir);
         $this->container_name = generateApplicationContainerName($this->application, $this->pull_request_id);
         savePrivateKeyToFs($this->server);
         $this->saved_outputs = collect();
@@ -138,6 +141,33 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->application_deployment_queue->update([
             'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
         ]);
+
+        // Generate custom host<->ip mapping
+        $allContainers = instant_remote_process(["docker network inspect {$this->destination->network} -f '{{json .Containers}}' "], $this->server);
+        $allContainers = format_docker_command_output_to_json($allContainers);
+        $ips = collect([]);
+        if (count($allContainers) > 0) {
+            $allContainers = $allContainers[0];
+            foreach ($allContainers as $container) {
+                $containerName = data_get($container, 'Name');
+                if ($containerName === 'coolify-proxy') {
+                    continue;
+                }
+                $containerIp = data_get($container, 'IPv4Address');
+                if ($containerName && $containerIp) {
+                    $containerIp = str($containerIp)->before('/');
+                    $ips->put($containerName, $containerIp->value());
+                }
+            }
+        }
+        $this->addHosts = $ips->map(function ($ip, $name) {
+            return "--add-host $name:$ip";
+        })->implode(' ');
+
+        // Get user home directory
+        $this->serverUserHomeDir = instant_remote_process(["echo \$HOME"], $this->server);
+        ray("test -f {$this->serverUserHomeDir}/.docker/config.json && echo 'OK' || echo 'NOK'");
+        $this->dockerConfigFileExists = instant_remote_process(["test -f {$this->serverUserHomeDir}/.docker/config.json && echo 'OK' || echo 'NOK'"], $this->server);
         try {
             if ($this->application->dockerfile) {
                 $this->deploy_simple_dockerfile();
@@ -428,7 +458,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->stop_running_container();
         $this->execute_remote_command(
             ["echo -n 'Starting preview deployment.'"],
-            [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up -d >/dev/null"), "hidden" => true],
+            [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up -d"), "hidden" => true],
         );
     }
 
@@ -436,7 +466,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     {
         $pull = "--pull=always";
         $helperImage = config('coolify.helper_image');
-        $runCommand = "docker run {$pull} -d --network {$this->destination->network} -v /:/host  --name {$this->deployment_uuid} --rm -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
+        if ($this->dockerConfigFileExists === 'OK') {
+            $runCommand = "docker run {$pull} -d --network {$this->destination->network} -v /:/host --name {$this->deployment_uuid} --rm -v {$this->serverUserHomeDir}/.docker/config.json:/root/.docker/config.json:ro -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
+        } else {
+            $runCommand = "docker run {$pull} -d --network {$this->destination->network} -v /:/host --name {$this->deployment_uuid} --rm -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
+        }
 
         $this->execute_remote_command(
             [
@@ -766,7 +800,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
         if ($this->application->settings->is_static) {
             $this->execute_remote_command([
-                executeInDocker($this->deployment_uuid, "docker build --network host -f {$this->workdir}/{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}"), "hidden" => true
+                executeInDocker($this->deployment_uuid, "docker build $this->addHosts --network host -f {$this->workdir}/{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}"), "hidden" => true
             ]);
 
             $dockerfile = base64_encode("FROM {$this->application->static_image}
@@ -799,12 +833,12 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                     executeInDocker($this->deployment_uuid, "echo '{$nginx_config}' | base64 -d > {$this->workdir}/nginx.conf")
                 ],
                 [
-                    executeInDocker($this->deployment_uuid, "docker build --network host -f {$this->workdir}/Dockerfile-prod {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                    executeInDocker($this->deployment_uuid, "docker build $this->addHosts --network host -f {$this->workdir}/Dockerfile-prod {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
                 ]
             );
         } else {
             $this->execute_remote_command([
-                executeInDocker($this->deployment_uuid, "docker build --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                executeInDocker($this->deployment_uuid, "docker build $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
             ]);
         }
     }
@@ -830,7 +864,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
     {
         $this->execute_remote_command(
             ["echo -n 'Starting application (could take a while).'"],
-            [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up --build -d >/dev/null"), "hidden" => true],
+            [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up --build -d"), "hidden" => true],
         );
     }
 

app/Jobs/ContainerStatusJob.php

@@ -2,6 +2,7 @@
 
 namespace App\Jobs;
 
+use App\Actions\Proxy\CheckProxy;
 use App\Actions\Proxy\StartProxy;
 use App\Models\ApplicationPreview;
 use App\Models\Server;
@@ -47,7 +48,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
     public function handle()
     {
         try {
-            ray("checking server status for {$this->server->id}");
+            // ray("checking server status for {$this->server->id}");
             // ray()->clearAll();
             $serverUptimeCheckNumber = $this->server->unreachable_count;
             $serverUptimeCheckNumberMax = 3;
@@ -117,10 +118,18 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                 return data_get($value, 'Name') === '/coolify-proxy';
             })->first();
             if (!$foundProxyContainer) {
-                if ($this->server->isProxyShouldRun()) {
+                try {
-                    StartProxy::run($this->server, false);
+                    $shouldStart = CheckProxy::run($this->server);
-                    $this->server->team->notify(new ContainerRestarted('coolify-proxy', $this->server));
+                    if ($shouldStart) {
+                        StartProxy::run($this->server, false);
+                        $this->server->team->notify(new ContainerRestarted('coolify-proxy', $this->server));
+                    } else {
+                        ray('Proxy could not be started.');
+                    }
+                } catch (\Throwable $e) {
+                    ray($e);
                 }
+
             } else {
                 $this->server->proxy->status = data_get($foundProxyContainer, 'State.Status');
                 $this->server->save();

app/Models/Server.php

@@ -193,23 +193,24 @@ class Server extends BaseModel
     }
     public function isProxyShouldRun()
     {
-        $shouldRun = false;
         if ($this->proxyType() === ProxyTypes::NONE->value) {
             return false;
         }
-        foreach ($this->applications() as $application) {
+        // foreach ($this->applications() as $application) {
-            if (data_get($application, 'fqdn')) {
+        //     if (data_get($application, 'fqdn')) {
-                $shouldRun = true;
+        //         $shouldRun = true;
-                break;
+        //         break;
-            }
+        //     }
-        }
+        // }
-        if ($this->id === 0) {
+        // ray($this->services()->get());
-            $settings = InstanceSettings::get();
+
-            if (data_get($settings, 'fqdn')) {
+        // if ($this->id === 0) {
-                $shouldRun = true;
+        //     $settings = InstanceSettings::get();
-            }
+        //     if (data_get($settings, 'fqdn')) {
-        }
+        //         $shouldRun = true;
-        return $shouldRun;
+        //     }
+        // }
+        return true;
     }
     public function isFunctional()
     {

app/Models/Service.php

@@ -382,7 +382,7 @@ class Service extends BaseModel
                         $value = Str::of($variable);
                     }
                     if ($key->startsWith('SERVICE_FQDN')) {
-                        if ($isNew) {
+                        if ($isNew || $savedService->fqdn === null) {
                             $name = $key->after('SERVICE_FQDN_')->beforeLast('_')->lower();
                             $fqdn = generateFqdn($this->server, "{$name->value()}-{$this->uuid}");
                             if (substr_count($key->value(), '_') === 3) {

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.86',
+    'release' => '4.0.0-beta.92',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.86';
+return '4.0.0-beta.92';

resources/views/layouts/base.blade.php

@@ -5,6 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="preconnect" href="https://api.fonts.coollabs.io" crossorigin>
     <link href="https://api.fonts.coollabs.io/css2?family=Inter&display=swap" rel="stylesheet">
+    <meta name="robots" content="noindex">
     <title>Coolify</title>
     @env('local')
     <link rel="icon" href="{{ asset('favicon-dev.png') }}" type="image/x-icon" />

resources/views/livewire/project/application/deployment-navbar.blade.php

@@ -7,6 +7,6 @@
     @endif
     @if (data_get($application_deployment_queue, 'status') === 'in_progress' ||
             data_get($application_deployment_queue, 'status') === 'queued')
-        <x-forms.button wire:click.prevent="cancel">Cancel deployment</x-forms.button>
+        <x-forms.button wire:click.prevent="cancel">Cancel Deployment</x-forms.button>
     @endif
 </div>

resources/views/livewire/project/new/select.blade.php

@@ -152,6 +152,9 @@
                     @endforeach
                 @endif
             </div>
+            <div class="py-4 pb-10">Trademarks Policy: The respective trademarks mentioned here are owned by the
+                respective
+                companies, and use of them does not imply any affiliation or endorsement.</div>
         @endif
         @if ($current_step === 'servers')
             <ul class="pb-10 steps">

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

@@ -18,10 +18,10 @@
             <div class="flex gap-2">
                 @if ($application->required_fqdn)
                     <x-forms.input required placeholder="https://app.coolify.io" label="Domains"
-                        id="application.fqdn"></x-forms.input>
+                        id="application.fqdn" 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. "></x-forms.input>
                 @else
                     <x-forms.input placeholder="https://app.coolify.io" label="Domains"
-                        id="application.fqdn"></x-forms.input>
+                        id="application.fqdn" 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. "></x-forms.input>
                 @endif
                 <x-forms.input required
                     helper="You can change the image you would like to deploy.<br><br><span class='text-warning'>WARNING. You could corrupt your data. Only do it if you know what you are doing.</span>"

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

@@ -1,4 +1,4 @@
-<div x-init="$wire.checkStatus">
+<div x-init="$wire.checkStatus" wire:poll.2500ms='checkStatus'>
     <livewire:project.service.modal />
     <h1>Configuration</h1>
     <x-resources.breadcrumbs :resource="$service" :parameters="$parameters" />

scripts/install.sh

@@ -18,7 +18,7 @@ if [ $EUID != 0 ]; then
     echo "Please run as root"
     exit
 fi
-if [ $OS_TYPE != "ubuntu" ] && [ $OS_TYPE != "debian" ]; then
+if [ $OS_TYPE != "ubuntu" ] && [ $OS_TYPE != "debian" ] && [ $OS_TYPE != "raspbian" ]; then
     echo "This script only supports Ubuntu and Debian for now."
     exit
 fi

versions.json

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