Merge pull request #1783 from coollabsio/next

v4.0.0-beta.226

app/Console/Commands/CleanupApplicationDeploymentQueue.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\ApplicationDeploymentQueue;
+use Illuminate\Console\Command;
+
+class CleanupApplicationDeploymentQueue extends Command
+{
+    protected $signature = 'cleanup:application-deployment-queue {--team-id=}';
+    protected $description = 'CleanupApplicationDeploymentQueue';
+
+    public function handle()
+    {
+        $team_id = $this->option('team-id');
+        $servers = \App\Models\Server::where('team_id', $team_id)->get();
+        foreach ($servers as $server) {
+            $deployments = ApplicationDeploymentQueue::whereIn("status", ["in_progress", "queued"])->where("server_id", $server->id)->get();
+            foreach ($deployments as $deployment) {
+                $deployment->update(['status' => 'failed']);
+                instant_remote_process(['docker rm -f ' . $deployment->deployment_uuid], $server, false);
+            }
+        }
+    }
+}

app/Console/Commands/CleanupDatabase.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+class CleanupDatabase extends Command
+{
+    protected $signature = 'cleanup:database {--yes}';
+    protected $description = 'Cleanup database';
+
+    public function handle()
+    {
+        echo "Running database cleanup...\n";
+        $keep_days = 60;
+
+        // Cleanup failed jobs table
+        $failed_jobs = DB::table('failed_jobs')->where('failed_at', '<', now()->subDays(7));
+        $count = $failed_jobs->count();
+        echo "Delete $count entries from failed_jobs.\n";
+        if ($this->option('yes')) {
+            $failed_jobs->delete();
+        }
+
+        // Cleanup sessions table
+        $sessions = DB::table('sessions')->where('last_activity', '<', now()->subDays($keep_days)->timestamp);
+        $count = $sessions->count();
+        echo "Delete $count entries from sessions.\n";
+        if ($this->option('yes')) {
+            $sessions->delete();
+        }
+
+        // Cleanup activity_log table
+        $activity_log = DB::table('activity_log')->where('created_at', '<', now()->subDays($keep_days));
+        $count = $activity_log->count();
+        echo "Delete $count entries from activity_log.\n";
+        if ($this->option('yes')) {
+            $activity_log->delete();
+        }
+
+        // Cleanup application_deployment_queues table
+        $application_deployment_queues = DB::table('application_deployment_queues')->where('created_at', '<', now()->subDays($keep_days));
+        $count = $application_deployment_queues->count();
+        echo "Delete $count entries from application_deployment_queues.\n";
+        if ($this->option('yes')) {
+            $application_deployment_queues->delete();
+        }
+
+        // Cleanup webhooks table
+        $webhooks = DB::table('webhooks')->where('created_at', '<', now()->subDays($keep_days));
+        $count = $webhooks->count();
+        echo "Delete $count entries from webhooks.\n";
+        if ($this->option('yes')) {
+            $webhooks->delete();
+        }
+
+    }
+}

app/Console/Commands/CleanupUnreachableServers.php

@@ -8,15 +8,16 @@ use Illuminate\Console\Command;
 class CleanupUnreachableServers extends Command
 {
     protected $signature = 'cleanup:unreachable-servers';
-    protected $description = 'Cleanup Unreachable Servers (3 days)';
+    protected $description = 'Cleanup Unreachable Servers (7 days)';
 
     public function handle()
     {
         echo "Running unreachable server cleanup...\n";
-        $servers = Server::where('unreachable_count', 3)->where('unreachable_notification_sent', true)->where('updated_at', '<', now()->subDays(3))->get();
+        $servers = Server::where('unreachable_count', 3)->where('unreachable_notification_sent', true)->where('updated_at', '<', now()->subDays(7))->get();
         if ($servers->count() > 0) {
             foreach ($servers as $server) {
                 echo "Cleanup unreachable server ($server->id) with name $server->name";
+                send_internal_notification("Server $server->name is unreachable for 7 days. Cleaning up...");
                 $server->update([
                     'ip' => '1.2.3.4'
                 ]);

app/Console/Kernel.php

@@ -69,12 +69,34 @@ class Kernel extends ConsoleKernel
         }
         foreach ($containerServers as $server) {
             $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
+            // $schedule
+            //     ->call(function () use ($server) {
+            //         $randomSeconds = rand(1, 40);
+            //         $job = new ContainerStatusJob($server);
+            //         $job->delay($randomSeconds);
+            //         ray('dispatching container status job in ' . $randomSeconds . ' seconds');
+            //         dispatch($job);
+            //     })->name('container-status-' . $server->id)->everyMinute()->onOneServer();
             if ($server->isLogDrainEnabled()) {
                 $schedule->job(new CheckLogDrainContainerJob($server))->everyMinute()->onOneServer();
+                // $schedule
+                //     ->call(function () use ($server) {
+                //         $randomSeconds = rand(1, 40);
+                //         $job = new CheckLogDrainContainerJob($server);
+                //         $job->delay($randomSeconds);
+                //         dispatch($job);
+                //     })->name('log-drain-container-check-' . $server->id)->everyMinute()->onOneServer();
             }
         }
         foreach ($servers as $server) {
             $schedule->job(new ServerStatusJob($server))->everyMinute()->onOneServer();
+            // $schedule
+            //     ->call(function () use ($server) {
+            //         $randomSeconds = rand(1, 40);
+            //         $job = new ServerStatusJob($server);
+            //         $job->delay($randomSeconds);
+            //         dispatch($job);
+            //     })->name('server-status-job-' . $server->id)->everyMinute()->onOneServer();
         }
     }
     private function instance_auto_update($schedule)

app/Http/Controllers/Api/Deploy.php

@@ -14,7 +14,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use Visus\Cuid2\Cuid2;
 
-class Deploy extends Controller
+class APIDeploy extends Controller
 {
     public function deploy(Request $request)
     {

app/Http/Controllers/Api/Project.php

@@ -6,7 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Models\Project as ModelsProject;
 use Illuminate\Http\Request;
 
-class Project extends Controller
+class APIProject extends Controller
 {
     public function projects(Request $request)
     {

app/Http/Controllers/Api/Server.php

@@ -6,7 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Models\Server as ModelsServer;
 use Illuminate\Http\Request;
 
-class Server extends Controller
+class APIServer extends Controller
 {
     public function servers(Request $request)
     {

app/Http/Middleware/DecideWhatToDoWithUser.php

@@ -44,7 +44,7 @@ class DecideWhatToDoWithUser
         if (auth()->user()->hasVerifiedEmail() && $request->path() === 'verify') {
             return redirect(RouteServiceProvider::HOME);
         }
-        if (isSubscriptionActive() && $request->path() === 'subscription') {
+        if (isSubscriptionActive() && $request->routeIs('subscription.index')) {
             return redirect(RouteServiceProvider::HOME);
         }
         return $next($request);

app/Jobs/ApplicationDeploymentJob.php

@@ -167,65 +167,71 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             if ($this->application->is_github_based()) {
                 ApplicationPullRequestUpdateJob::dispatch(application: $this->application, preview: $this->preview, deployment_uuid: $this->deployment_uuid, status: ProcessStatus::IN_PROGRESS);
             }
+            if ($this->application->build_pack === 'dockerfile') {
+                if (data_get($this->application, 'dockerfile_location')) {
+                    $this->dockerfile_location = $this->application->dockerfile_location;
+                }
+            }
         }
     }
 
     public function handle(): void
     {
-        // Generate custom host<->ip mapping
-        $allContainers = instant_remote_process(["docker network inspect {$this->destination->network} -f '{{json .Containers}}' "], $this->server);
-        if (!is_null($allContainers)) {
-            $allContainers = format_docker_command_output_to_json($allContainers);
-            $ips = collect([]);
-            if (count($allContainers) > 0) {
-                $allContainers = $allContainers[0];
-                $allContainers = collect($allContainers)->sort()->values();
-                foreach ($allContainers as $container) {
-                    $containerName = data_get($container, 'Name');
-                    if ($containerName === 'coolify-proxy') {
-                        continue;
-                    }
-                    if (preg_match('/-(\d{12})/', $containerName)) {
-                        continue;
-                    }
-                    $containerIp = data_get($container, 'IPv4Address');
-                    if ($containerName && $containerIp) {
-                        $containerIp = str($containerIp)->before('/');
-                        $ips->put($containerName, $containerIp->value());
+        try {
+            // Generate custom host<->ip mapping
+            $allContainers = instant_remote_process(["docker network inspect {$this->destination->network} -f '{{json .Containers}}' "], $this->server);
+
+            if (!is_null($allContainers)) {
+                $allContainers = format_docker_command_output_to_json($allContainers);
+                $ips = collect([]);
+                if (count($allContainers) > 0) {
+                    $allContainers = $allContainers[0];
+                    $allContainers = collect($allContainers)->sort()->values();
+                    foreach ($allContainers as $container) {
+                        $containerName = data_get($container, 'Name');
+                        if ($containerName === 'coolify-proxy') {
+                            continue;
+                        }
+                        if (preg_match('/-(\d{12})/', $containerName)) {
+                            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(' ');
             }
-            $this->addHosts = $ips->map(function ($ip, $name) {
-                return "--add-host $name:$ip";
-            })->implode(' ');
-        }
 
-        if ($this->application->dockerfile_target_build) {
-            $this->buildTarget = " --target {$this->application->dockerfile_target_build} ";
-        }
+            if ($this->application->dockerfile_target_build) {
+                $this->buildTarget = " --target {$this->application->dockerfile_target_build} ";
+            }
 
-        // Check custom port
-        ['repository' => $this->customRepository, 'port' => $this->customPort] = $this->application->customRepository();
+            // Check custom port
+            ['repository' => $this->customRepository, 'port' => $this->customPort] = $this->application->customRepository();
 
-        if (data_get($this->application, 'settings.is_build_server_enabled')) {
-            $teamId = data_get($this->application, 'environment.project.team.id');
-            $buildServers = Server::buildServers($teamId)->get();
-            if ($buildServers->count() === 0) {
-                $this->application_deployment_queue->addLogEntry("Build server feature activated, but no suitable build server found. Using the deployment server.");
+            if (data_get($this->application, 'settings.is_build_server_enabled')) {
+                $teamId = data_get($this->application, 'environment.project.team.id');
+                $buildServers = Server::buildServers($teamId)->get();
+                if ($buildServers->count() === 0) {
+                    $this->application_deployment_queue->addLogEntry("Build server feature activated, but no suitable build server found. Using the deployment server.");
+                    $this->build_server = $this->server;
+                    $this->original_server = $this->server;
+                } else {
+                    $this->application_deployment_queue->addLogEntry("Build server feature activated and found a suitable build server. Using it to build your application - if needed.");
+                    $this->build_server = $buildServers->random();
+                    $this->original_server = $this->server;
+                    $this->use_build_server = true;
+                }
+            } else {
+                // Set build server & original_server to the same as deployment server
                 $this->build_server = $this->server;
                 $this->original_server = $this->server;
-            } else {
-                $this->application_deployment_queue->addLogEntry("Build server feature activated and found a suitable build server. Using it to build your application - if needed.");
-                $this->build_server = $buildServers->random();
-                $this->original_server = $this->server;
-                $this->use_build_server = true;
             }
-        } else {
-            // Set build server & original_server to the same as deployment server
-            $this->build_server = $this->server;
-            $this->original_server = $this->server;
-        }
-        try {
             if ($this->restart_only && $this->application->build_pack !== 'dockerimage') {
                 $this->just_restart();
                 if ($this->server->isProxyShouldRun()) {
@@ -1223,6 +1229,19 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if ((bool)$this->application->settings->is_consistent_container_name_enabled) {
             $custom_compose = convert_docker_run_to_compose($this->application->custom_docker_run_options);
             if (count($custom_compose) > 0) {
+                $ipv4 = data_get($custom_compose, 'ip.0');
+                $ipv6 = data_get($custom_compose, 'ip6.0');
+                data_forget($custom_compose, 'ip');
+                data_forget($custom_compose, 'ip6');
+                if ($ipv4 || $ipv6) {
+                    data_forget($docker_compose['services'][$this->application->uuid], 'networks');
+                }
+                if ($ipv4) {
+                    $docker_compose['services'][$this->application->uuid]['networks'][$this->destination->network]['ipv4_address'] = $ipv4;
+                }
+                if ($ipv6) {
+                    $docker_compose['services'][$this->application->uuid]['networks'][$this->destination->network]['ipv6_address'] = $ipv6;
+                }
                 $docker_compose['services'][$this->container_name] = array_merge_recursive($docker_compose['services'][$this->container_name], $custom_compose);
             }
         } else {
@@ -1230,6 +1249,19 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             data_forget($docker_compose, 'services.' . $this->container_name);
             $custom_compose = convert_docker_run_to_compose($this->application->custom_docker_run_options);
             if (count($custom_compose) > 0) {
+                $ipv4 = data_get($custom_compose, 'ip.0');
+                $ipv6 = data_get($custom_compose, 'ip6.0');
+                data_forget($custom_compose, 'ip');
+                data_forget($custom_compose, 'ip6');
+                if ($ipv4 || $ipv6) {
+                    data_forget($docker_compose['services'][$this->application->uuid], 'networks');
+                }
+                if ($ipv4) {
+                    $docker_compose['services'][$this->application->uuid]['networks'][$this->destination->network]['ipv4_address'] = $ipv4;
+                }
+                if ($ipv6) {
+                    $docker_compose['services'][$this->application->uuid]['networks'][$this->destination->network]['ipv6_address'] = $ipv6;
+                }
                 $docker_compose['services'][$this->application->uuid] = array_merge_recursive($docker_compose['services'][$this->application->uuid], $custom_compose);
             }
         }
@@ -1634,6 +1666,8 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
 
     public function failed(Throwable $exception): void
     {
+
+        $this->next(ApplicationDeploymentStatus::FAILED->value);
         $this->application_deployment_queue->addLogEntry("Oops something is not okay, are you okay? 😢", 'stderr');
         if (str($exception->getMessage())->isNotEmpty()) {
             $this->application_deployment_queue->addLogEntry($exception->getMessage(), 'stderr');
@@ -1641,6 +1675,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
 
         if ($this->application->build_pack !== 'dockercompose') {
             $code = $exception->getCode();
+            ray($code);
             if ($code !== 69420) {
                 // 69420 means failed to push the image to the registry, so we don't need to remove the new version as it is the currently running one
                 $this->application_deployment_queue->addLogEntry("Deployment failed. Removing the new version of your application.", 'stderr');
@@ -1649,7 +1684,5 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                 );
             }
         }
-
-        $this->next(ApplicationDeploymentStatus::FAILED->value);
     }
 }

app/Jobs/ContainerStatusJob.php

@@ -43,6 +43,10 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
     public function handle()
     {
+        if (!$this->server->isFunctional()) {
+            return 'Server is not ready.';
+        };
+
         $applications = $this->server->applications();
         $skip_these_applications = collect([]);
         foreach ($applications as $application) {
@@ -57,10 +61,6 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
         $applications = $applications->filter(function ($value, $key) use ($skip_these_applications) {
             return !$skip_these_applications->pluck('id')->contains($value->id);
         });
-
-        if (!$this->server->isFunctional()) {
-            return 'Server is not ready.';
-        };
         try {
             if ($this->server->isSwarm()) {
                 $containers = instant_remote_process(["docker service inspect $(docker service ls -q) --format '{{json .}}'"], $this->server, false);

app/Jobs/ServerLimitCheckJob.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Team;
+use App\Notifications\Server\ForceDisabled;
+use App\Notifications\Server\ForceEnabled;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Queue\SerializesModels;
+
+class ServerLimitCheckJob implements ShouldQueue, ShouldBeEncrypted
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $tries = 4;
+    public function backoff(): int
+    {
+        return isDev() ? 1 : 3;
+    }
+    public function __construct(public Team $team)
+    {
+    }
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping($this->team->uuid))];
+    }
+
+    public function uniqueId(): int
+    {
+        return $this->team->uuid;
+    }
+
+    public function handle()
+    {
+        try {
+            $servers = $this->team->servers;
+            $servers_count = $servers->count();
+            $limit = $this->team->limits['serverLimit'];
+            $number_of_servers_to_disable = $servers_count - $limit;
+            ray('ServerLimitCheckJob', $this->team->uuid, $servers_count, $limit, $number_of_servers_to_disable);
+            if ($number_of_servers_to_disable > 0) {
+                ray('Disabling servers');
+                $servers = $servers->sortbyDesc('created_at');
+                $servers_to_disable = $servers->take($number_of_servers_to_disable);
+                $servers_to_disable->each(function ($server) {
+                    $server->forceDisableServer();
+                    $this->team->notify(new ForceDisabled($server));
+                });
+            } else if ($number_of_servers_to_disable === 0) {
+                $servers->each(function ($server) {
+                    if ($server->isForceDisabled()) {
+                        $server->forceEnableServer();
+                        $this->team->notify(new ForceEnabled($server));
+                    }
+                });
+            }
+        } catch (\Throwable $e) {
+            send_internal_notification('ServerLimitCheckJob failed with: ' . $e->getMessage());
+            ray($e->getMessage());
+            return handleError($e);
+        }
+    }
+}

app/Jobs/ServerStatusJob.php

@@ -41,15 +41,6 @@ class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
             throw new \RuntimeException('Server is not ready.');
         };
         try {
-            // $this->server->validateConnection();
-            // $this->server->validateOS();
-            // $docker_installed = $this->server->validateDockerEngine();
-            // if (!$docker_installed) {
-            //     $this->server->installDocker();
-            //     $this->server->validateDockerEngine();
-            // }
-
-            // $this->server->validateDockerEngineVersion();
             if ($this->server->isFunctional()) {
                 $this->cleanup(notify: false);
             }

app/Livewire/Admin/Index.php

@@ -3,6 +3,7 @@
 namespace App\Livewire\Admin;
 
 use App\Models\User;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Crypt;
 use Livewire\Component;
 
@@ -14,28 +15,26 @@ class Index extends Component
         if (!isCloud()) {
             return redirect()->route('dashboard');
         }
-        if (auth()->user()->id !== 0 && session('adminToken') === null) {
+        if (auth()->user()->id !== 0) {
             return redirect()->route('dashboard');
         }
         $this->users = User::whereHas('teams', function ($query) {
             $query->whereRelation('subscription', 'stripe_subscription_id', '!=', null);
-        })->get();
+        })->get()->filter(function ($user) {
+            return $user->id !== 0;
+        });
     }
     public function switchUser(int $user_id)
     {
-        $user = User::find($user_id);
-        auth()->login($user);
-
-        if ($user_id === 0) {
-            session()->forget('adminToken');
-        } else {
-            $token_payload = [
-                'valid' => true,
-            ];
-            $token = Crypt::encrypt($token_payload);
-            session(['adminToken' => $token]);
+        if (auth()->user()->id !== 0) {
+            return redirect()->route('dashboard');
         }
-        return refreshSession();
+        $user = User::find($user_id);
+        $team_to_switch_to = $user->teams->first();
+        Cache::forget("team:{$user->id}");
+        auth()->login($user);
+        refreshSession($team_to_switch_to);
+        return redirect(request()->header('Referer'));
     }
     public function render()
     {

app/Livewire/Dashboard.php

@@ -23,8 +23,8 @@ class Dashboard extends Component
     public function cleanup_queue()
     {
         $this->dispatch('success', 'Cleanup started.');
-        Artisan::queue('app:init', [
-            '--cleanup-deployments' => 'true'
+        Artisan::queue('cleanup:application-deployment-queue', [
+            '--team-id' => currentTeam()->id
         ]);
     }
     public function get_deployments()

app/Livewire/LayoutPopups.php

@@ -4,7 +4,7 @@ namespace App\Livewire;
 
 use Livewire\Component;
 
-class Sponsorship extends Component
+class LayoutPopups extends Component
 {
     public function getListeners()
     {
@@ -23,6 +23,6 @@ class Sponsorship extends Component
     }
     public function render()
     {
-        return view('livewire.sponsorship');
+        return view('livewire.layout-popups');
     }
 }

app/Livewire/Project/Database/Import.php

@@ -29,8 +29,8 @@ class Import extends Component
     public string $container;
     public array $importCommands = [];
     public string $postgresqlRestoreCommand = 'pg_restore -U $POSTGRES_USER -d $POSTGRES_DB';
-    public string $mysqlRestoreCommand = 'mysql -u $MYSQL_USER -p $MYSQL_PASSWORD $MYSQL_DATABASE';
-    public string $mariadbRestoreCommand = 'mariadb -u $MARIADB_USER -p $MARIADB_PASSWORD $MARIADB_DATABASE';
+    public string $mysqlRestoreCommand = 'mysql -u $MYSQL_USER -p$MYSQL_PASSWORD $MYSQL_DATABASE';
+    public string $mariadbRestoreCommand = 'mariadb -u $MARIADB_USER -p$MARIADB_PASSWORD $MARIADB_DATABASE';
 
     public function getListeners()
     {

app/Livewire/Project/Service/Navbar.php

@@ -64,7 +64,7 @@ class Navbar extends Component
         StopService::run($this->service);
         $this->service->refresh();
         if ($forceCleanup) {
-            $this->dispatch('success', 'Force cleanup service.');
+            $this->dispatch('success', 'Containers cleaned up.');
         } else {
             $this->dispatch('success', 'Service stopped.');
         }

app/Livewire/Project/Shared/ExecuteContainerCommand.php

@@ -107,6 +107,9 @@ class ExecuteContainerCommand extends Component
     {
         $this->validate();
         try {
+            if ($this->server->isForceDisabled()) {
+                throw new \RuntimeException('Server is disabled.');
+            }
             // Wrap command to prevent escaped execution in the host.
             $cmd = 'sh -c "if [ -f ~/.profile ]; then . ~/.profile; fi; ' . str_replace('"', '\"', $this->command)  . '"';
             if (!empty($this->workDir)) {

app/Livewire/Server/Create.php

@@ -3,6 +3,7 @@
 namespace App\Livewire\Server;
 
 use App\Models\PrivateKey;
+use App\Models\Team;
 use Livewire\Component;
 
 class Create extends Component
@@ -16,11 +17,7 @@ class Create extends Component
             $this->limit_reached = false;
             return;
         }
-        $team = currentTeam();
-        $servers = $team->servers->count();
-        ['serverLimit' => $serverLimit] = $team->limits;
-
-        $this->limit_reached = $servers >= $serverLimit;
+        $this->limit_reached = Team::serverLimitReached();
     }
     public function render()
     {

app/Livewire/Server/New/ByIp.php

@@ -5,6 +5,7 @@ namespace App\Livewire\Server\New;
 use App\Enums\ProxyStatus;
 use App\Enums\ProxyTypes;
 use App\Models\Server;
+use App\Models\Team;
 use Livewire\Component;
 
 class ByIp extends Component
@@ -76,6 +77,9 @@ class ByIp extends Component
             if (is_null($this->private_key_id)) {
                 return $this->dispatch('error', 'You must select a private key');
             }
+            if (Team::serverLimitReached()) {
+                return $this->dispatch('error', 'You have reached the server limit for your subscription.');
+            }
             $payload = [
                 'name' => $this->name,
                 'description' => $this->description,

app/Livewire/Subscription/Actions.php

@@ -2,11 +2,18 @@
 
 namespace App\Livewire\Subscription;
 
+use App\Models\Team;
 use Illuminate\Support\Facades\Http;
 use Livewire\Component;
 
 class Actions extends Component
 {
+    public $server_limits = 0;
+    
+    public function mount()
+    {
+        $this->server_limits = Team::serverLimit();
+    }
     public function cancel()
     {
         try {
@@ -69,7 +76,8 @@ class Actions extends Component
             return handleError($e, $this);
         }
     }
-    public function stripeCustomerPortal() {
+    public function stripeCustomerPortal()
+    {
         $session = getStripeCustomerPortalSession(currentTeam());
         redirect($session->url);
     }

app/Livewire/Subscription/Index.php

@@ -10,14 +10,19 @@ class Index extends Component
 {
     public InstanceSettings $settings;
     public bool $alreadySubscribed = false;
-    public function mount() {
+    public function mount()
+    {
         if (!isCloud()) {
             return redirect(RouteServiceProvider::HOME);
         }
+        if (data_get(currentTeam(), 'subscription')) {
+            return redirect()->route('subscription.show');
+        }
         $this->settings = InstanceSettings::get();
         $this->alreadySubscribed = currentTeam()->subscription()->exists();
     }
-    public function stripeCustomerPortal() {
+    public function stripeCustomerPortal()
+    {
         $session = getStripeCustomerPortalSession(currentTeam());
         if (is_null($session)) {
             return;

app/Livewire/Subscription/PricingPlans.php

@@ -9,8 +9,9 @@ use Stripe\Checkout\Session;
 class PricingPlans extends Component
 {
     public bool $isTrial = false;
-    public function mount() {
-        $this->isTrial = !data_get(currentTeam(),'subscription.stripe_trial_already_ended');
+    public function mount()
+    {
+        $this->isTrial = !data_get(currentTeam(), 'subscription.stripe_trial_already_ended');
         if (config('constants.limits.trial_period') == 0) {
             $this->isTrial = false;
         }
@@ -26,15 +27,15 @@ class PricingPlans extends Component
             case 'basic-yearly':
                 $priceId = config('subscription.stripe_price_id_basic_yearly');
                 break;
-            case 'ultimate-monthly':
-                $priceId = config('subscription.stripe_price_id_ultimate_monthly');
-                break;
             case 'pro-monthly':
                 $priceId = config('subscription.stripe_price_id_pro_monthly');
                 break;
             case 'pro-yearly':
                 $priceId = config('subscription.stripe_price_id_pro_yearly');
                 break;
+            case 'ultimate-monthly':
+                $priceId = config('subscription.stripe_price_id_ultimate_monthly');
+                break;
             case 'ultimate-yearly':
                 $priceId = config('subscription.stripe_price_id_ultimate_yearly');
                 break;
@@ -64,18 +65,25 @@ class PricingPlans extends Component
             'success_url' => route('dashboard', ['success' => true]),
             'cancel_url' => route('subscription.index', ['cancelled' => true]),
         ];
-
-        if (!data_get($team,'subscription.stripe_trial_already_ended')) {
-            if (config('constants.limits.trial_period') > 0) {
-            $payload['subscription_data'] = [
-                'trial_period_days' => config('constants.limits.trial_period'),
-                'trial_settings' => [
-                    'end_behavior' => [
-                        'missing_payment_method' => 'cancel',
-                    ]
-                ],
+        if (str($type)->contains('ultimate')) {
+            $payload['line_items'][0]['adjustable_quantity'] = [
+                'enabled' => true,
+                'minimum' => 10,
             ];
+            $payload['line_items'][0]['quantity'] = 10;
         }
+
+        if (!data_get($team, 'subscription.stripe_trial_already_ended')) {
+            if (config('constants.limits.trial_period') > 0) {
+                $payload['subscription_data'] = [
+                    'trial_period_days' => config('constants.limits.trial_period'),
+                    'trial_settings' => [
+                        'end_behavior' => [
+                            'missing_payment_method' => 'cancel',
+                        ]
+                    ],
+                ];
+            }
             $payload['payment_method_collection'] = 'if_required';
         }
         $customer = currentTeam()->subscription?->stripe_customer_id ?? null;

app/Livewire/Subscription/Show.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Livewire\Subscription;
+
+use Livewire\Component;
+
+class Show extends Component
+{
+    public function mount()
+    {
+        if (!isCloud()) {
+            return redirect()->route('dashboard');
+        }
+        if (!data_get(currentTeam(), 'subscription')) {
+            return redirect()->route('subscription.index');
+        }
+    }
+    public function render()
+    {
+        return view('livewire.subscription.show');
+    }
+}

app/Livewire/Tags/Show.php

@@ -2,7 +2,7 @@
 
 namespace App\Livewire\Tags;
 
-use App\Http\Controllers\Api\Deploy;
+use App\Http\Controllers\Api\APIDeploy as Deploy;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\Tag;
 use Livewire\Component;

app/Livewire/Team/Member.php

@@ -16,6 +16,11 @@ class Member extends Component
         $this->dispatch('reloadWindow');
     }
 
+    public function makeOwner()
+    {
+        $this->member->teams()->updateExistingPivot(currentTeam()->id, ['role' => 'owner']);
+        $this->dispatch('reloadWindow');
+    }
     public function makeReadonly()
     {
         $this->member->teams()->updateExistingPivot(currentTeam()->id, ['role' => 'member']);
@@ -26,7 +31,7 @@ class Member extends Component
     {
         $this->member->teams()->detach(currentTeam());
         Cache::forget("team:{$this->member->id}");
-        Cache::remember('team:' . $this->member->id, 3600, function() {
+        Cache::remember('team:' . $this->member->id, 3600, function () {
             return $this->member->teams()->first();
         });
         $this->dispatch('reloadWindow');

app/Models/Server.php

@@ -10,6 +10,7 @@ use App\Notifications\Server\Unreachable;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Storage;
 use Spatie\SchemalessAttributes\Casts\SchemalessAttributes;
 use Spatie\SchemalessAttributes\SchemalessAttributesTrait;
 use Illuminate\Support\Str;
@@ -69,7 +70,7 @@ class Server extends BaseModel
 
     static public function isUsable()
     {
-        return Server::ownedByCurrentTeam()->whereRelation('settings', 'is_reachable', true)->whereRelation('settings', 'is_usable', true)->whereRelation('settings', 'is_swarm_worker', false)->whereRelation('settings', 'is_build_server', false);
+        return Server::ownedByCurrentTeam()->whereRelation('settings', 'is_reachable', true)->whereRelation('settings', 'is_usable', true)->whereRelation('settings', 'is_swarm_worker', false)->whereRelation('settings', 'is_build_server', false)->whereRelation('settings', 'force_disabled', false);
     }
 
     static public function destinationsByServer(string $server_id)
@@ -146,11 +147,34 @@ class Server extends BaseModel
     public function skipServer()
     {
         if ($this->ip === '1.2.3.4') {
-            ray('skipping 1.2.3.4');
+            // ray('skipping 1.2.3.4');
+            return true;
+        }
+        if ($this->settings->force_disabled === true) {
+            // ray('force_disabled');
             return true;
         }
         return false;
     }
+    public function isForceDisabled()
+    {
+        return $this->settings->force_disabled;
+    }
+    public function forceEnableServer()
+    {
+        $this->settings->update([
+            'force_disabled' => false,
+        ]);
+    }
+    public function forceDisableServer()
+    {
+        $this->settings->update([
+            'force_disabled' => true,
+        ]);
+        $sshKeyFileLocation = "id.root@{$this->uuid}";
+        Storage::disk('ssh-keys')->delete($sshKeyFileLocation);
+        Storage::disk('ssh-mux')->delete($this->muxFilename());
+    }
     public function isServerReady(int $tries = 3)
     {
         if ($this->skipServer()) {
@@ -374,7 +398,7 @@ class Server extends BaseModel
     }
     public function isFunctional()
     {
-        return $this->settings->is_reachable && $this->settings->is_usable;
+        return $this->settings->is_reachable && $this->settings->is_usable && !$this->settings->force_disabled;
     }
     public function isLogDrainEnabled()
     {

app/Models/Service.php

@@ -6,7 +6,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Str;
 
 class Service extends BaseModel
 {
@@ -28,47 +27,73 @@ class Service extends BaseModel
     {
         return $this->morphToMany(Tag::class, 'taggable');
     }
-    public function status() {
-        $foundRunning = false;
-        $isDegraded = false;
-        $foundRestaring = false;
+    public function status()
+    {
         $applications = $this->applications;
         $databases = $this->databases;
+
+        $complexStatus = null;
+        $complexHealth = null;
+
         foreach ($applications as $application) {
             if ($application->exclude_from_status) {
                 continue;
             }
-            if (Str::of($application->status)->startsWith('running')) {
-                $foundRunning = true;
-            } else if (Str::of($application->status)->startsWith('restarting')) {
-                $foundRestaring = true;
+            $status = str($application->status)->before('(')->trim();
+            $health = str($application->status)->between('(', ')')->trim();
+            if ($complexStatus === 'degraded') {
+                continue;
+            }
+            if ($status->startsWith('running')) {
+                if ($complexStatus === 'exited') {
+                    $complexStatus = 'degraded';
+                } else {
+                    $complexStatus = 'running';
+                }
+            } else if ($status->startsWith('restarting')) {
+                $complexStatus = 'degraded';
+            } else if ($status->startsWith('exited')) {
+                $complexStatus = 'exited';
+            }
+            if ($health->value() === 'healthy') {
+                if ($complexHealth === 'unhealthy') {
+                    continue;
+                }
+                $complexHealth = 'healthy';
             } else {
-                $isDegraded = true;
+                $complexHealth = 'unhealthy';
             }
         }
         foreach ($databases as $database) {
             if ($database->exclude_from_status) {
                 continue;
             }
-            if (Str::of($database->status)->startsWith('running')) {
-                $foundRunning = true;
-            } else if (Str::of($database->status)->startsWith('restarting')) {
-                $foundRestaring = true;
+            $status = str($database->status)->before('(')->trim();
+            $health = str($database->status)->between('(', ')')->trim();
+            if ($complexStatus === 'degraded') {
+                continue;
+            }
+            if ($status->startsWith('running')) {
+                if ($complexStatus === 'exited') {
+                    $complexStatus = 'degraded';
+                } else {
+                    $complexStatus = 'running';
+                }
+            } else if ($status->startsWith('restarting')) {
+                $complexStatus = 'degraded';
+            } else if ($status->startsWith('exited')) {
+                $complexStatus = 'exited';
+            }
+            if ($health->value() === 'healthy') {
+                if ($complexHealth === 'unhealthy') {
+                    continue;
+                }
+                $complexHealth = 'healthy';
             } else {
-                $isDegraded = true;
+                $complexHealth = 'unhealthy';
             }
         }
-        if ($foundRestaring) {
-            return 'degraded';
-        }
-        if ($foundRunning && !$isDegraded) {
-            return 'running';
-        } else if ($foundRunning && $isDegraded) {
-            return 'degraded';
-        } else if (!$foundRunning && !$isDegraded) {
-            return 'exited';
-        }
-        return 'exited';
+        return "{$complexStatus}:{$complexHealth}";
     }
     public function extraFields()
     {
@@ -414,7 +439,7 @@ class Service extends BaseModel
     public function documentation()
     {
         $services = getServiceTemplates();
-        $service = data_get($services, Str::of($this->name)->beforeLast('-')->value, []);
+        $service = data_get($services, str($this->name)->beforeLast('-')->value, []);
         return data_get($service, 'documentation', config('constants.docs.base_url'));
     }
     public function applications()

app/Models/Subscription.php

@@ -30,8 +30,7 @@ class Subscription extends Model
             if (in_array($subscription, $ultimate)) {
                 return 'ultimate';
             }
-        }
-        if (isStripe()) {
+        } else if (isStripe()) {
             if (!$this->stripe_plan_id) {
                 return 'zero';
             }
@@ -55,7 +54,7 @@ class Subscription extends Model
                 };
             })->first();
             if ($stripePlanId) {
-                return Str::of($stripePlanId)->after('stripe_price_id_')->before('_')->lower();
+                return str($stripePlanId)->after('stripe_price_id_')->before('_')->lower();
             }
         }
         return 'zero';

app/Models/Team.php

@@ -48,7 +48,22 @@ class Team extends Model implements SendsDiscord, SendsEmail
         }
         return explode(',', $recipients);
     }
-
+    static public function serverLimitReached() {
+        $serverLimit = Team::serverLimit();
+        $team = currentTeam();
+        $servers = $team->servers->count();
+        return $servers >= $serverLimit;
+    }
+    public function serverOverflow() {
+        if ($this->serverLimit() < $this->servers->count()) {
+            return true;
+        }
+        return false;
+    }
+    static public function serverLimit()
+    {
+        return Team::find(currentTeam()->id)->limits['serverLimit'];
+    }
     public function limits(): Attribute
     {
         return Attribute::make(
@@ -63,14 +78,19 @@ class Team extends Model implements SendsDiscord, SendsEmail
                         $subscription = $subscription->type();
                     }
                 }
-                $serverLimit = config('constants.limits.server')[strtolower($subscription)];
+                if ($this->custom_server_limit) {
+                    $serverLimit = $this->custom_server_limit;
+                } else {
+                    $serverLimit = config('constants.limits.server')[strtolower($subscription)];
+                }
                 $sharedEmailEnabled = config('constants.limits.email')[strtolower($subscription)];
                 return ['serverLimit' => $serverLimit, 'sharedEmailEnabled' => $sharedEmailEnabled];
             }
 
         );
     }
-    public function environment_variables() {
+    public function environment_variables()
+    {
         return $this->hasMany(SharedEnvironmentVariable::class)->whereNull('project_id')->whereNull('environment_id');
     }
     public function members()
@@ -130,7 +150,8 @@ class Team extends Model implements SendsDiscord, SendsEmail
     {
         return $this->hasMany(S3Storage::class)->where('is_usable', true);
     }
-    public function trialEnded() {
+    public function trialEnded()
+    {
         foreach ($this->servers as $server) {
             $server->settings()->update([
                 'is_usable' => false,
@@ -138,7 +159,8 @@ class Team extends Model implements SendsDiscord, SendsEmail
             ]);
         }
     }
-    public function trialEndedButSubscribed() {
+    public function trialEndedButSubscribed()
+    {
         foreach ($this->servers as $server) {
             $server->settings()->update([
                 'is_usable' => true,

app/Models/User.php

@@ -67,7 +67,7 @@ class User extends Authenticatable implements SendsEmail
             'team_id' => session('currentTeam')->id
         ]);
 
-        return new NewAccessToken($token, $token->getKey().'|'.$plainTextToken);
+        return new NewAccessToken($token, $token->getKey() . '|' . $plainTextToken);
     }
     public function teams()
     {
@@ -103,9 +103,13 @@ class User extends Authenticatable implements SendsEmail
 
     public function isAdmin()
     {
-        return data_get($this->pivot, 'role') === 'admin' || data_get($this->pivot, 'role') === 'owner';
+        return $this->role() === 'admin' || $this->role() === 'owner';
     }
 
+    public function isOwner()
+    {
+        return $this->role() === 'owner';
+    }
     public function isAdminFromSession()
     {
         if (auth()->user()->id === 0) {
@@ -155,6 +159,9 @@ class User extends Authenticatable implements SendsEmail
 
     public function role()
     {
-        return session('currentTeam')->pivot->role;
+        if (data_get($this, 'pivot')) {
+            return $this->pivot->role;
+        }
+        return auth()->user()->teams->where('id', currentTeam()->id)->first()->pivot->role;
     }
 }

app/Notifications/Server/ForceDisabled.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Notifications\Server;
+
+use App\Models\Server;
+use Illuminate\Bus\Queueable;
+use App\Notifications\Channels\DiscordChannel;
+use App\Notifications\Channels\EmailChannel;
+use App\Notifications\Channels\TelegramChannel;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class ForceDisabled extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public $tries = 1;
+    public function __construct(public Server $server)
+    {
+    }
+
+    public function via(object $notifiable): array
+    {
+        $channels = [];
+        $isEmailEnabled = isEmailEnabled($notifiable);
+        $isDiscordEnabled = data_get($notifiable, 'discord_enabled');
+        $isTelegramEnabled = data_get($notifiable, 'telegram_enabled');
+
+        if ($isDiscordEnabled) {
+            $channels[] = DiscordChannel::class;
+        }
+        if ($isEmailEnabled) {
+            $channels[] = EmailChannel::class;
+        }
+        if ($isTelegramEnabled) {
+            $channels[] = TelegramChannel::class;
+        }
+        return $channels;
+    }
+
+    public function toMail(): MailMessage
+    {
+        $mail = new MailMessage();
+        $mail->subject("Coolify: Server ({$this->server->name}) disabled because it is not paid!");
+        $mail->view('emails.server-force-disabled', [
+            'name' => $this->server->name,
+        ]);
+        return $mail;
+    }
+
+    public function toDiscord(): string
+    {
+        $message = "Coolify: Server ({$this->server->name}) disabled because it is not paid!\n All automations and integrations are stopped.\nPlease update your subscription to enable the server again [here](https://app.coolify.io/subsciprtions).";
+        return $message;
+    }
+    public function toTelegram(): array
+    {
+        return [
+            "message" => "Coolify: Server ({$this->server->name}) disabled because it is not paid!\n All automations and integrations are stopped.\nPlease update your subscription to enable the server again [here](https://app.coolify.io/subsciprtions)."
+        ];
+    }
+}

app/Notifications/Server/ForceEnabled.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Notifications\Server;
+
+use App\Models\Server;
+use Illuminate\Bus\Queueable;
+use App\Notifications\Channels\DiscordChannel;
+use App\Notifications\Channels\EmailChannel;
+use App\Notifications\Channels\TelegramChannel;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class ForceEnabled extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public $tries = 1;
+    public function __construct(public Server $server)
+    {
+    }
+
+    public function via(object $notifiable): array
+    {
+        $channels = [];
+        $isEmailEnabled = isEmailEnabled($notifiable);
+        $isDiscordEnabled = data_get($notifiable, 'discord_enabled');
+        $isTelegramEnabled = data_get($notifiable, 'telegram_enabled');
+
+        if ($isDiscordEnabled) {
+            $channels[] = DiscordChannel::class;
+        }
+        if ($isEmailEnabled) {
+            $channels[] = EmailChannel::class;
+        }
+        if ($isTelegramEnabled) {
+            $channels[] = TelegramChannel::class;
+        }
+        return $channels;
+    }
+
+    public function toMail(): MailMessage
+    {
+        $mail = new MailMessage();
+        $mail->subject("Coolify: Server ({$this->server->name}) enabled again!");
+        $mail->view('emails.server-force-enabled', [
+            'name' => $this->server->name,
+        ]);
+        return $mail;
+    }
+
+    public function toDiscord(): string
+    {
+        $message = "Coolify: Server ({$this->server->name}) enabled again!";
+        return $message;
+    }
+    public function toTelegram(): array
+    {
+        return [
+            "message" => "Coolify: Server ({$this->server->name}) enabled again!"
+        ];
+    }
+}

bootstrap/helpers/docker.php

@@ -423,7 +423,7 @@ function convert_docker_run_to_compose(?string $custom_docker_run_options = null
         '--security-opt',
         '--sysctl',
         '--ulimit',
-        '--device'
+        '--device',
     ]);
     $mapping = collect([
         '--cap-add' => 'cap_add',
@@ -435,6 +435,7 @@ function convert_docker_run_to_compose(?string $custom_docker_run_options = null
         '--init' => 'init',
         '--ulimit' => 'ulimits',
         '--privileged' => 'privileged',
+        '--ip' => 'ip',
     ]);
     foreach ($matches as $match) {
         $option = $match[1];

bootstrap/helpers/remoteProcess.php

@@ -110,6 +110,9 @@ function instant_scp(string $source, string $dest, Server $server, $throwError =
 }
 function generateSshCommand(Server $server, string $command)
 {
+    if ($server->settings->force_disabled) {
+        throw new \RuntimeException('Server is disabled.');
+    }
     $user = $server->user;
     $port = $server->port;
     $privateKeyLocation = savePrivateKeyToFs($server);

bootstrap/helpers/subscriptions.php

@@ -109,7 +109,7 @@ function isPaddle()
 function getStripeCustomerPortalSession(Team $team)
 {
     Stripe::setApiKey(config('subscription.stripe_api_key'));
-    $return_url = route('team.index');
+    $return_url = route('subscription.show');
     $stripe_customer_id = data_get($team,'subscription.stripe_customer_id');
     if (!$stripe_customer_id) {
         return null;
@@ -123,7 +123,7 @@ function getStripeCustomerPortalSession(Team $team)
 function allowedPathsForUnsubscribedAccounts()
 {
     return [
-        'subscription',
+        'subscription/new',
         'login',
         'logout',
         'waitlist',

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

config/subscription.php

@@ -13,6 +13,12 @@ return [
     'stripe_price_id_ultimate_yearly' => env('STRIPE_PRICE_ID_ULTIMATE_YEARLY', null),
     'stripe_excluded_plans' => env('STRIPE_EXCLUDED_PLANS', null),
 
+    'stripe_price_id_basic_monthly_old' => env('STRIPE_PRICE_ID_BASIC_MONTHLY_OLD', null),
+    'stripe_price_id_basic_yearly_old' => env('STRIPE_PRICE_ID_BASIC_YEARLY_OLD', null),
+    'stripe_price_id_pro_monthly_old' => env('STRIPE_PRICE_ID_PRO_MONTHLY_OLD', null),
+    'stripe_price_id_pro_yearly_old' => env('STRIPE_PRICE_ID_PRO_YEARLY_OLD', null),
+    'stripe_price_id_ultimate_monthly_old' => env('STRIPE_PRICE_ID_ULTIMATE_MONTHLY_OLD', null),
+    'stripe_price_id_ultimate_yearly_old' => env('STRIPE_PRICE_ID_ULTIMATE_YEARLY_OLD', null),
 
     // Paddle
     'paddle_vendor_id' => env('PADDLE_VENDOR_ID', null),

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.223';
+return '4.0.0-beta.226';

database/migrations/2024_02_23_143119_add_custom_server_limits_to_teams_ultimate.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('teams', function (Blueprint $table) {
+            $table->integer('custom_server_limit')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('teams', function (Blueprint $table) {
+            $table->dropColumn('custom_server_limit');
+        });
+    }
+};

database/migrations/2024_02_25_222150_add_server_force_disabled_field.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('server_settings', function (Blueprint $table) {
+            $table->boolean('force_disabled')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('server_settings', function (Blueprint $table) {
+            $table->dropColumn('force_disabled');
+        });
+    }
+};

docker-compose.prod.yml

@@ -57,6 +57,12 @@ services:
       - STRIPE_PRICE_ID_PRO_YEARLY
       - STRIPE_PRICE_ID_ULTIMATE_MONTHLY
       - STRIPE_PRICE_ID_ULTIMATE_YEARLY
+      - STRIPE_PRICE_ID_BASIC_MONTHLY_OLD
+      - STRIPE_PRICE_ID_BASIC_YEARLY_OLD
+      - STRIPE_PRICE_ID_PRO_MONTHLY_OLD
+      - STRIPE_PRICE_ID_PRO_YEARLY_OLD
+      - STRIPE_PRICE_ID_ULTIMATE_MONTHLY_OLD
+      - STRIPE_PRICE_ID_ULTIMATE_YEARLY_OLD
       - STRIPE_EXCLUDED_PLANS
       - PADDLE_VENDOR_ID
       - PADDLE_WEBHOOK_SECRET

public/svgs/firefly.svg

@@ -0,0 +1,21 @@
+<!--
+  - maskable-icon.svg
+  - Copyright (c) 2022 james@firefly-iii.org
+  -
+  - This file is part of Firefly III (https://github.com/firefly-iii).
+  -
+  - This program is free software: you can redistribute it and/or modify
+  - it under the terms of the GNU Affero General Public License as
+  - published by the Free Software Foundation, either version 3 of the
+  - License, or (at your option) any later version.
+  -
+  - This program is distributed in the hope that it will be useful,
+  - but WITHOUT ANY WARRANTY; without even the implied warranty of
+  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  - GNU Affero General Public License for more details.
+  -
+  - You should have received a copy of the GNU Affero General Public License
+  - along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<svg height="377.95276" width="377.95276" xmlns="http://www.w3.org/2000/svg"><path d="m0 0h377.95276v377.95276h-377.95276z" fill="#cd5029" stroke-width="1.96129"/><g transform="matrix(.77452773 0 0 .77452773 21.636074 21.374655)"><path d="m140.49013 78.646381 2.249 53.017999s-40.103 29.566-45.538 68l-16.001 1.231s-11.539 2.564-11.539 14.103v37.18s3.846 11.538 12.82 11.538l16.487-.319s8 30.5 36.5 50.5v25.5s-2 8.5 15.5 11 40.75 2.25 44.5-1.5 3.75-4.5 3.75-9c0 0 21.25 5 60.25 0v5s3.5 7 29 7 33-3 37.5-12v-25s37.009-36.264 35.75-91.75c-1.083-47.75-15.901-64.299-35.806-82.96-22.67-21.254-69.944-31.165-117.944-25.353.001-.001-24.341-43.937999-67.478-36.187999z" fill="#fff"/><circle cx="135.46912" cy="214.39638" fill="#cd5029" r="9.5"/><path d="m360.08113 190.51238s-18.218-8.742-40.662 3.996c0 0-26.711-8.987-40.99 2.593-14.828 12.025-16.299 26.115-15.525 42.785 0 0 12.837-43.915 45.252-32.571 0 0-22.947 40.43 12.761 47.508 0 0 8.436-.05 15.401-4.256 6.644-4.011 11.842-11.433 9.711-24.814 0 0-4.348-13.336-15.569-21.42 0 0 11.042-7.806 31.988-2.209z" fill="#cd5029"/><path d="m320.19013 213.01938s-16.689 31.461 5.607 29.767c0 0 11.838-5.656 4.887-17.127-7.147-11.796-10.494-12.64-10.494-12.64z" fill="#fff"/></g><path d="m188.97638 175.70052s4.01698 13.60604-3.69586 21.52748c-7.713 7.92145-6.8792 16.6767-3.75227 20.84588 3.12692 4.16917 2.91831 7.29593.41674 9.58905-2.50141 2.29312-4.58608 3.96073-6.04523.20846-1.45916-3.75228-3.12676-3.75228-3.75228-5.62834-.62552-1.87605-1.87622-5.21142-1.87622-5.21142s-3.96072 6.25384-6.46229 10.00611c-2.50157 3.75228-2.50141 9.58922-.83381 12.71598 1.66761 3.12676 1.04226 6.87903-.20845 12.09046-1.2507 5.21143.4169 13.13288 6.25369 16.2598 5.83678 3.12692 12.92459 5.62833 16.05135 8.5468s10.42301 5.62833 19.80362 3.54382c9.3806-2.0845 21.26294-11.67355 23.34744-18.13585 0 0 5.41988-6.04523 4.37763-13.96668s-4.79469-7.71316-6.4623-13.75839c-1.6676-6.04523 3.60854-4.55469-.8338-14.93382 0 0-1.98012-4.94005-9.50352-8.49899-4.83404-2.28661-1.54469-12.63061-10.09149-23.05347s-16.73295-12.14688-16.73295-12.14688z" fill="#ffa284" stroke-width=".162598"/></svg>

resources/views/components/banner.blade.php

@@ -0,0 +1,22 @@
+@props(['closable' => true])
+<div x-data="{
+    bannerVisible: false,
+    bannerVisibleAfter: 100,
+}" x-show="bannerVisible" x-transition:enter="transition ease-out duration-200"
+    x-transition:enter-start="-translate-y-10" x-transition:enter-end="translate-y-0"
+    x-transition:leave="transition ease-in duration-100" x-transition:leave-start="translate-y-0"
+    x-transition:leave-end="-translate-y-10" x-init="setTimeout(() => { bannerVisible = true }, bannerVisibleAfter);"
+    class="relative z-50 w-full py-2 mx-auto duration-100 ease-out shadow-sm bg-coolgray-100 sm:py-0 sm:h-14" x-cloak>
+    <div class="flex items-center justify-between h-full px-3">
+        {{ $slot }}
+        @if ($closable)
+            <button @click="bannerVisible=false"
+                class="flex items-center flex-shrink-0 translate-x-1 ease-out duration-150 justify-center w-6 h-6 p-1.5 text-neutral-200 rounded-full hover:bg-coolgray-500">
+                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                    stroke="currentColor" class="w-full h-full">
+                    <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+                </svg>
+            </button>
+        @endif
+    </div>
+</div>

resources/views/components/limit-reached.blade.php

@@ -1,6 +1,6 @@
 <div class="flex flex-col items-center justify-center h-screen">
     <span class="text-xl font-bold text-white">You have reached the limit of {{ $name }} you can create.</span>
-    <span>Please <a class="text-white underline "href="{{ route('team.index') }}">upgrade your
+    <span>Please <a class="text-white underline "href="{{ route('subscription.show') }}">upgrade your
             subscription</a> to create more
         {{ $name }}.</span>
 </div>

resources/views/components/navbar.blade.php

@@ -44,9 +44,10 @@
                 <div>
                     <button x-on:click.prevent="open = !open" x-on:click.away="open = false" type="button"
                         class="py-4 mx-4" id="menu-button" aria-expanded="true" aria-haspopup="true">
-                        <svg class="icon" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
-                            <path fill="currentColor"
-                                d="M224 128a8 8 0 0 1-8 8h-80v80a8 8 0 0 1-16 0v-80H40a8 8 0 0 1 0-16h80V40a8 8 0 0 1 16 0v80h80a8 8 0 0 1 8 8" />
+                        <svg class="icon text-neutral-400" xmlns="http://www.w3.org/2000/svg" width="200" height="200"
+                            viewBox="0 0 24 24">
+                            <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
+                                stroke-width="2" d="M4 6h16M4 12h16M4 18h16" />
                         </svg>
                     </button>
                 </div>
@@ -131,11 +132,24 @@
                                     <path d="M5 5a2 2 0 1 0 4 0a2 2 0 0 0 -4 0" />
                                     <path d="M3 13v-1a2 2 0 0 1 2 -2h2" />
                                 </svg>
-                                Teams @if (isCloud())
-                                    / Subscription
-                                @endif
+                                Teams
                             </a>
                         </li>
+                        @if (isCloud())
+                            <li title="Subscription" class="hover:bg-coolgray-200">
+                                <a class="hover:bg-transparent hover:no-underline"
+                                    href="{{ route('subscription.show') }}">
+                                    <svg xmlns="http://www.w3.org/2000/svg"
+                                        class="{{ request()->is('subscription*') ? 'text-warning icon' : 'icon' }}"
+                                        viewBox="0 0 24 24">
+                                        <path fill="none" stroke="currentColor" stroke-linecap="round"
+                                            stroke-linejoin="round" stroke-width="2"
+                                            d="M3 8a3 3 0 0 1 3-3h12a3 3 0 0 1 3 3v8a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3zm0 2h18M7 15h.01M11 15h2" />
+                                    </svg>
+                                    Subscription
+                                </a>
+                            </li>
+                        @endif
 
                         @if (isInstanceAdmin())
                             <li title="Settings" class="hover:bg-coolgray-200">

resources/views/components/pricing-plans.blade.php

@@ -34,7 +34,7 @@
             <div>
             </div>
         </div>
-        <div class="p-4 rounded bg-coolgray-400">
+        {{-- <div class="p-4 rounded bg-coolgray-400">
             <h2 id="tier-hobby" class="flex items-start gap-4 text-4xl font-bold tracking-tight">Unlimited Trial
                 <x-forms.button><a class="font-bold text-white hover:no-underline"
                         href="https://github.com/coollabsio/coolify">Get Started</a></x-forms.button>
@@ -42,8 +42,11 @@
             <p class="mt-4 text-sm leading-6">Start self-hosting <span class="text-warning">without limits</span> with
                 our
                 OSS version. Same features as the paid version, but you have to manage by yourself.</p>
-        </div>
+        </div> --}}
+
         <div class="flow-root mt-12">
+            <div class="pb-10 text-xl text-center">For the detailed list of features, please visit our landing page: <a
+                    class="font-bold text-white underline" href="https://coolify.io">coolify.io</a></div>
             <div
                 class="grid max-w-sm grid-cols-1 -mt-16 divide-y divide-coolgray-500 isolate gap-y-16 sm:mx-auto lg:-mx-8 lg:mt-0 lg:max-w-none lg:grid-cols-3 lg:divide-x lg:divide-y-0 xl:-mx-4">
 
@@ -70,21 +73,18 @@
                             {{ $basic }}
                         @endisset
                     @endif
-                    <p class="mt-10 text-sm leading-6 text-white h-[6.5rem]">Start self-hosting in
-                        the cloud
-                        with a
-                        single
-                        server.
+                    <p class="mt-10 text-sm leading-6 text-white h-[6.5rem]">Begin hosting your own services in the
+                        cloud.
                     </p>
                     <ul role="list" class="space-y-3 text-sm leading-6 ">
-                        <li class="flex gap-x-3">
-                            <svg class="flex-none w-5 h-6 text-warning" viewBox="0 0 20 20" fill="currentColor"
+                        <li class="flex">
+                            <svg class="flex-none w-5 h-6 mr-3 text-warning" viewBox="0 0 20 20" fill="currentColor"
                                 aria-hidden="true">
                                 <path fill-rule="evenodd"
                                     d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
                                     clip-rule="evenodd" />
                             </svg>
-                            2 servers <x-helper helper="Bring Your Own Server." />
+                            Connect <span class="px-1 font-bold text-white">2</span> servers
                         </li>
                         <li class="flex gap-x-3">
                             <svg class="flex-none w-5 h-6 text-warning" viewBox="0 0 20 20" fill="currentColor"
@@ -141,17 +141,18 @@
                             {{ $pro }}
                         @endisset
                     @endif
-                    <p class="h-20 mt-10 text-sm leading-6 text-white">Scale your business or self-hosting environment.
+                    <p class="h-20 mt-10 text-sm leading-6 text-white">Expand your business or set up your own hosting
+                        environment.
                     </p>
                     <ul role="list" class="mt-6 space-y-3 text-sm leading-6 ">
-                        <li class="flex gap-x-3">
-                            <svg class="flex-none w-5 h-6 text-warning" viewBox="0 0 20 20" fill="currentColor"
+                        <li class="flex ">
+                            <svg class="flex-none w-5 h-6 mr-3 text-warning" viewBox="0 0 20 20" fill="currentColor"
                                 aria-hidden="true">
                                 <path fill-rule="evenodd"
                                     d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
                                     clip-rule="evenodd" />
                             </svg>
-                            10 servers <x-helper helper="Bring Your Own Server." />
+                            Connect <span class="px-1 font-bold text-white">10</span> servers
                         </li>
                         <li class="flex gap-x-3">
                             <svg class="flex-none w-5 h-6 text-warning" viewBox="0 0 20 20" fill="currentColor"
@@ -187,38 +188,38 @@
                 </div>
                 <div class="pt-16 lg:px-8 lg:pt-0 xl:px-14">
                     <h3 id="tier-ultimate" class="text-base font-semibold leading-7 text-white">Ultimate</h3>
-                    <p class="flex items-baseline mt-6 gap-x-1">
+                   <p class="flex items-baseline mt-6 gap-x-1">
                         <span x-show="selected === 'monthly'" x-cloak>
-                            <span class="text-4xl font-bold tracking-tight text-white">$?</span>
-                            <span class="text-sm font-semibold leading-6 ">/month + VAT</span>
+                            <span class="text-4xl font-bold tracking-tight text-white">Custom</span>
+                            {{-- <span class="text-sm font-semibold leading-6 ">pay-as-you-go</span> --}}
                         </span>
                         <span x-show="selected === 'yearly'" x-cloak>
-                            <span class="text-4xl font-bold tracking-tight text-white">$?</span>
-                            <span class="text-sm font-semibold leading-6 ">/month + VAT</span>
+                            <span class="text-4xl font-bold tracking-tight text-white">Custom</span>
+                            {{-- <span class="text-sm font-semibold leading-6 ">/month + VAT</span> --}}
                         </span>
                     </p>
-                    <span x-show="selected === 'monthly'" x-cloak>
-                        <span>billed monthly</span>
+                     <span x-show="selected === 'monthly'" x-cloak>
+                        <span>pay-as-you-go</span>
                     </span>
                     <span x-show="selected === 'yearly'" x-cloak>
-                        <span>billed annually</span>
+                        <span>pay-as-you-go</span>
                     </span>
                     @if ($showSubscribeButtons)
                         @isset($ultimate)
                             {{ $ultimate }}
                         @endisset
                     @endif
-                    <p class="h-20 mt-10 text-sm leading-6 text-white">Deploy complex infrastructures and
-                        manage them easily in one place.</p>
+                    <p class="h-20 mt-10 text-sm leading-6 text-white">Easily manage complex infrastructures in a
+                        single location.</p>
                     <ul role="list" class="mt-6 space-y-3 text-sm leading-6 ">
-                        <li class="flex gap-x-3">
-                            <svg class="flex-none w-5 h-6 text-warning" viewBox="0 0 20 20" fill="currentColor"
+                        <li class="flex ">
+                            <svg class="flex-none w-5 h-6 mr-3 text-warning" viewBox="0 0 20 20" fill="currentColor"
                                 aria-hidden="true">
                                 <path fill-rule="evenodd"
                                     d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.857-9.809a.75.75 0 00-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 10-1.06 1.061l2.5 2.5a.75.75 0 001.137-.089l4-5.5z"
                                     clip-rule="evenodd" />
                             </svg>
-                            ? servers <x-helper helper="Bring Your Own Server." />
+                            Connect <span class="px-1 font-bold text-white">10+</span> servers
                         </li>
 
                         <li class="flex gap-x-3">
@@ -254,7 +255,7 @@
                     </ul>
                 </div>
             </div>
-            <div class="p-4 mt-10 rounded">
+            {{-- <div class="p-4 mt-10 rounded">
                 <div class="flex items-start gap-4 text-xl tracking-tight">Need official support for
                     your self-hosted instance?
                     <x-forms.button>
@@ -263,9 +264,10 @@
                             Us</a>
                     </x-forms.button>
                 </div>
-            </div>
+            </div> --}}
         </div>
-        <div class="pt-8 pb-12 text-4xl font-bold text-center text-white">Included in all plans</div>
+
+        {{-- <div class="pt-8 pb-12 text-4xl font-bold text-center text-white">Included in all plans</div>
         <div class="grid grid-cols-1 gap-10 md:grid-cols-2 gap-y-28">
             <div>
                 <div class="flex items-center gap-4 mb-4">
@@ -433,7 +435,7 @@
         </div>
         <div class="pt-20 text-xs">
             <span class="text-warning">*</span> Some features are work in progress and will be available soon.
-        </div>
+        </div> --}}
     </div>
     @isset($other)
         {{ $other }}

resources/views/components/server/sidebar.blade.php

@@ -1,24 +1,18 @@
-<div>
-    @if ($server->isFunctional())
-        <div class="flex h-full pr-4">
-            <div class="flex flex-col w-48 gap-4 min-w-fit">
-                <a class="{{ request()->routeIs('server.proxy') ? 'text-white' : '' }}"
-                    href="{{ route('server.proxy', $parameters) }}">
-                    <button>Configuration</button>
-                </a>
-                @if (data_get($server, 'proxy.type') !== 'NONE')
-                    <a class="{{ request()->routeIs('server.proxy.dynamic-confs') ? 'text-white' : '' }}"
-                        href="{{ route('server.proxy.dynamic-confs', $parameters) }}">
-                        <button>Dynamic Configurations</button>
-                    </a>
-                    <a class="{{ request()->routeIs('server.proxy.logs') ? 'text-white' : '' }}"
-                        href="{{ route('server.proxy.logs', $parameters) }}">
-                        <button>Logs</button>
-                    </a>
-                @endif
-            </div>
-        </div>
-    @else
-        <div>Server is not validated. Validate first.</div>
-    @endif
+<div class="flex h-full pr-4">
+    <div class="flex flex-col w-48 gap-4 min-w-fit">
+        <a class="{{ request()->routeIs('server.proxy') ? 'text-white' : '' }}"
+            href="{{ route('server.proxy', $parameters) }}">
+            <button>Configuration</button>
+        </a>
+        @if (data_get($server, 'proxy.type') !== 'NONE')
+            <a class="{{ request()->routeIs('server.proxy.dynamic-confs') ? 'text-white' : '' }}"
+                href="{{ route('server.proxy.dynamic-confs', $parameters) }}">
+                <button>Dynamic Configurations</button>
+            </a>
+            <a class="{{ request()->routeIs('server.proxy.logs') ? 'text-white' : '' }}"
+                href="{{ route('server.proxy.logs', $parameters) }}">
+                <button>Logs</button>
+            </a>
+        @endif
+    </div>
 </div>

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

@@ -1,11 +1,11 @@
 <div class="navbar-main" x-data>
-    <a  class="{{ request()->routeIs('project.service.configuration') ? 'text-white' : '' }}"
+    <a class="{{ request()->routeIs('project.service.configuration') ? 'text-white' : '' }}"
         href="{{ route('project.service.configuration', $parameters) }}">
         <button>Configuration</button>
     </a>
     <x-services.links />
     <div class="flex-1"></div>
-    @if ($service->status() === 'degraded')
+    @if (str($service->status())->contains('degraded'))
         <button wire:click='deploy' onclick="startService.showModal()"
             class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
             <svg class="w-5 h-5 text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
@@ -26,11 +26,10 @@
             Stop
         </button>
     @endif
-    @if ($service->status() === 'running')
+    @if (str($service->status())->contains('running'))
         <button wire:click='restart' class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
             <svg class="w-5 h-5 text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
-                    stroke-width="2">
+                <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
                     <path d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
                     <path d="M20 4v5h-5" />
                 </g>
@@ -47,7 +46,7 @@
             Stop
         </button>
     @endif
-    @if ($service->status() === 'exited')
+    @if (str($service->status())->contains('exited'))
         <button wire:click='stop(true)'
             class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
             <svg class="w-5 h-5 " viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
@@ -70,9 +69,9 @@
 </div>
 
 @script
-<script>
-    $wire.on('image-pulled', () => {
-        startService.showModal();
-    });
-</script>
+    <script>
+        $wire.on('image-pulled', () => {
+            startService.showModal();
+        });
+    </script>
 @endscript

resources/views/components/status/degraded.blade.php

@@ -2,7 +2,12 @@
     'status' => 'Degraded',
 ])
 <x-loading wire:loading.delay.longer />
-<div class="flex items-center gap-2" wire:loading.remove.delay.longer>
+<div class="flex items-center" wire:loading.remove.delay.longer>
     <div class="badge badge-warning badge-xs"></div>
-    <div class="text-xs font-medium tracking-wide text-warning">{{ Str::headline($status) }}</div>
+    <div class="pl-2 pr-1 text-xs font-bold tracking-widerr text-warning">
+        {{ str($status)->before(':')->headline() }}
+    </div>
+    @if (!str($status)->startsWith('Proxy') && !str($status)->contains('('))
+        <div class="text-xs text-warning">({{ str($status)->after(':') }})</div>
+    @endif
 </div>

resources/views/components/status/restarting.blade.php

@@ -2,7 +2,7 @@
     'status' => 'Restarting',
 ])
 <x-loading wire:loading.delay.longer />
-<div class="flex items-center " wire:loading.remove.delay.longer>
+<div class="flex items-center" wire:loading.remove.delay.longer>
     <div class="badge badge-warning badge-xs"></div>
     <div class="pl-2 pr-1 text-xs font-bold tracking-widerr text-warning">
         {{ str($status)->before(':')->headline() }}

resources/views/emails/before-trial-conversion.blade.php

@@ -3,5 +3,5 @@ We would like to inform you that a {{ config('constants.limits.trial_period') }}
 
 You can try out Coolify, without payment information for free. If you like it, you can upgrade to a paid plan at any time.
 
-[Click here](https://app.coolify.io/subscription) to start your trial.
+[Click here](https://app.coolify.io/subscription/new) to start your trial.
 </x-emails.layout>

resources/views/emails/server-force-disabled.blade.php

@@ -0,0 +1,5 @@
+<x-emails.layout>
+Your server ({{ $name }}) disabled because it is not paid! All automations and integrations are stopped.
+
+Please update your subscription to enable the server again [here](https://app.coolify.io/subsciprtions).
+</x-emails.layout>

resources/views/emails/server-force-enabled.blade.php

@@ -0,0 +1,3 @@
+<x-emails.layout>
+Your server ({{ $name }}) is enabled again!
+</x-emails.layout>

resources/views/layouts/app.blade.php

@@ -7,7 +7,7 @@
             <magic-bar></magic-bar>
         </div>
     @endpersist
-    <livewire:sponsorship />
+    <livewire:layout-popups />
     @auth
         <livewire:realtime-connection />
     @endauth

resources/views/livewire/admin/index.blade.php

@@ -4,7 +4,7 @@
     {{ auth()->user()->name }}
     <h3 class="pt-4">Users</h3>
     <div class="flex flex-wrap gap-2">
-        <div class="w-96 box" wire:click="switchUser('0')">
+        <div class="text-white cursor-pointer w-96 box-without-bg bg-coollabs-100" wire:click="switchUser('0')">
             Root
         </div>
         @foreach ($users as $user)

resources/views/livewire/dashboard.blade.php

@@ -5,7 +5,7 @@
     <h1>Dashboard</h1>
     <div class="subtitle">Your self-hosted environment</div>
     @if (request()->query->get('success'))
-        <div class="text-white rounded alert alert-success">
+        <div class="mb-10 text-white rounded alert alert-success">
             <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 stroke-current shrink-0" fill="none"
                 viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
@@ -16,53 +16,52 @@
         </div>
     @endif
     @if ($projects->count() === 0 && $servers->count() === 0)
-        No resources found. Add your first server / private key <a class="text-white underline"
-            href="{{ route('server.create') }}">here</a>.
+        No resources found. Add your first server & private key <a class="text-white underline"
+            href="{{ route('server.create') }}">here</a> or go to the <a class="text-white underline" href="{{ route('boarding') }}">boarding  page</a>.
     @endif
     @if ($projects->count() > 0)
         <h3 class="pb-4">Projects</h3>
-    @endif
-    @if ($projects->count() === 1)
-        <div class="grid grid-cols-1 gap-2">
-        @else
-            <div class="grid grid-cols-1 gap-2 xl:grid-cols-2">
-    @endif
-    @foreach ($projects as $project)
-        <div class="gap-2 border border-transparent cursor-pointer box group">
-            @if (data_get($project, 'environments')->count() === 1)
-                <a class="flex flex-col flex-1 mx-6 hover:no-underline"
-                    href="{{ route('project.resource.index', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => data_get($project, 'environments.0.name', 'production')]) }}">
-                    <div class="font-bold text-white">{{ $project->name }}</div>
-                    <div class="description">
-                        {{ $project->description }}</div>
-                </a>
+        @if ($projects->count() === 1)
+            <div class="grid grid-cols-1 gap-2">
             @else
-                <a class="flex flex-col flex-1 mx-6 hover:no-underline"
-                    href="{{ route('project.show', ['project_uuid' => data_get($project, 'uuid')]) }}">
-                    <div class="font-bold text-white">{{ $project->name }}</div>
-                    <div class="description">
-                        {{ $project->description }}</div>
-                </a>
-            @endif
-            <div class="flex items-center">
-                <a class="mx-4 rounded group-hover:text-white hover:no-underline"
-                    href="{{ route('project.resource.create', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => data_get($project, 'environments.0.name', 'production')]) }}">
-                    <span class="font-bold hover:text-warning">+ Add Resource</span>
-                </a>
-                <a class="mx-4 rounded group-hover:text-white"
-                    href="{{ route('project.edit', ['project_uuid' => data_get($project, 'uuid')]) }}">
-                    <svg xmlns="http://www.w3.org/2000/svg" class="icon hover:text-warning" viewBox="0 0 24 24"
-                        stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
-                        stroke-linejoin="round">
-                        <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                        <path
-                            d="M10.325 4.317c.426 -1.756 2.924 -1.756 3.35 0a1.724 1.724 0 0 0 2.573 1.066c1.543 -.94 3.31 .826 2.37 2.37a1.724 1.724 0 0 0 1.065 2.572c1.756 .426 1.756 2.924 0 3.35a1.724 1.724 0 0 0 -1.066 2.573c.94 1.543 -.826 3.31 -2.37 2.37a1.724 1.724 0 0 0 -2.572 1.065c-.426 1.756 -2.924 1.756 -3.35 0a1.724 1.724 0 0 0 -2.573 -1.066c-1.543 .94 -3.31 -.826 -2.37 -2.37a1.724 1.724 0 0 0 -1.065 -2.572c-1.756 -.426 -1.756 -2.924 0 -3.35a1.724 1.724 0 0 0 1.066 -2.573c-.94 -1.543 .826 -3.31 2.37 -2.37c1 .608 2.296 .07 2.572 -1.065z" />
-                        <path d="M9 12a3 3 0 1 0 6 0a3 3 0 0 0 -6 0" />
-                    </svg>
-                </a>
+                <div class="grid grid-cols-1 gap-2 xl:grid-cols-2">
+        @endif
+        @foreach ($projects as $project)
+            <div class="gap-2 border border-transparent cursor-pointer box group">
+                @if (data_get($project, 'environments')->count() === 1)
+                    <a class="flex flex-col flex-1 mx-6 hover:no-underline"
+                        href="{{ route('project.resource.index', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => data_get($project, 'environments.0.name', 'production')]) }}">
+                        <div class="font-bold text-white">{{ $project->name }}</div>
+                        <div class="description">
+                            {{ $project->description }}</div>
+                    </a>
+                @else
+                    <a class="flex flex-col flex-1 mx-6 hover:no-underline"
+                        href="{{ route('project.show', ['project_uuid' => data_get($project, 'uuid')]) }}">
+                        <div class="font-bold text-white">{{ $project->name }}</div>
+                        <div class="description">
+                            {{ $project->description }}</div>
+                    </a>
+                @endif
+                <div class="flex items-center">
+                    <a class="mx-4 rounded group-hover:text-white hover:no-underline"
+                        href="{{ route('project.resource.create', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => data_get($project, 'environments.0.name', 'production')]) }}">
+                        <span class="font-bold hover:text-warning">+ Add Resource</span>
+                    </a>
+                    <a class="mx-4 rounded group-hover:text-white"
+                        href="{{ route('project.edit', ['project_uuid' => data_get($project, 'uuid')]) }}">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="icon hover:text-warning" viewBox="0 0 24 24"
+                            stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
+                            stroke-linejoin="round">
+                            <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                            <path
+                                d="M10.325 4.317c.426 -1.756 2.924 -1.756 3.35 0a1.724 1.724 0 0 0 2.573 1.066c1.543 -.94 3.31 .826 2.37 2.37a1.724 1.724 0 0 0 1.065 2.572c1.756 .426 1.756 2.924 0 3.35a1.724 1.724 0 0 0 -1.066 2.573c.94 1.543 -.826 3.31 -2.37 2.37a1.724 1.724 0 0 0 -2.572 1.065c-.426 1.756 -2.924 1.756 -3.35 0a1.724 1.724 0 0 0 -2.573 -1.066c-1.543 .94 -3.31 -.826 -2.37 -2.37a1.724 1.724 0 0 0 -1.065 -2.572c-1.756 -.426 -1.756 -2.924 0 -3.35a1.724 1.724 0 0 0 1.066 -2.573c-.94 -1.543 .826 -3.31 2.37 -2.37c1 .608 2.296 .07 2.572 -1.065z" />
+                            <path d="M9 12a3 3 0 1 0 6 0a3 3 0 0 0 -6 0" />
+                        </svg>
+                    </a>
+                </div>
             </div>
-        </div>
-    @endforeach
+        @endforeach
 </div>
 @if ($projects->count() > 0)
     <h3 class="py-4">Servers</h3>
@@ -139,6 +138,7 @@
         <div>No deployments running.</div>
     @endforelse
 </div>
+@endif
 <script>
     function gotoProject(uuid, environment = 'production') {
         window.location.href = '/project/' + uuid + '/' + environment;

resources/views/livewire/layout-popups.blade.php

@@ -11,4 +11,13 @@
             </div>
         </div>
     @endif
+    @if (currentTeam()->serverOverflow())
+        <x-banner :closable=false>
+            <div><span class="font-bold text-red-500">WARNING:</span> The number of active servers exceeds the limit
+                covered by your payment. If not resolved, some of your servers <span class="font-bold text-red-500">will
+                    be deactivated</span>. Visit <a href="{{ route('subscription.show') }}"
+                    class="text-white underline">/subscription</a> to update your subscription or remove some servers.
+            </div>
+        </x-banner>
+    @endif
 </div>

resources/views/livewire/project/application/deployment/show.blade.php

@@ -52,8 +52,8 @@
                         @foreach (decode_remote_command_output($application_deployment_queue) as $line)
                             <div @class([
                                 'font-mono',
-                                'text-warning' => $line['hidden'],
-                                'text-red-500' => $line['type'] == 'stderr',
+                                'text-warning whitespace-pre-line' => $line['hidden'],
+                                'text-red-500 whitespace-pre-line' => $line['type'] == 'stderr',
                             ])>[{{ $line['timestamp'] }}] @if ($line['hidden'])
                                     <br>COMMAND: <br>{{ $line['command'] }} <br><br>OUTPUT:
                                     @endif @if (str($line['output'])->contains('http://') || str($line['output'])->contains('https://'))

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

@@ -168,7 +168,7 @@
                 <x-forms.button wire:click="loadServices('force')">Reload List</x-forms.button>
                 <input
                     class="w-full text-white rounded input input-sm bg-coolgray-200 disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500 read-only:text-neutral-500 read-only:bg-coolgray-200/50"
-                    wire:model.live.debounce.200ms="search" placeholder="Search...">
+                    wire:model.live.debounce.200ms="search" autofocus placeholder="Search...">
             </div>
             <div class="grid justify-start grid-cols-1 gap-4 text-left xl:grid-cols-3">
                 @if ($loadingServices)
@@ -176,28 +176,29 @@
                 @else
                     @forelse ($services as $serviceName => $service)
                         @if (data_get($service, 'minversion') && version_compare(config('version'), data_get($service, 'minversion'), '<'))
-                        <x-resource-view wire="setType('one-click-service-{{ $serviceName }}')">
-                            <x-slot:title> {{ Str::headline($serviceName) }}</x-slot>
-                            <x-slot:description>
-                                @if (data_get($service, 'slogan'))
-                                    {{ data_get($service, 'slogan') }}
-                                @endif
+                            <x-resource-view wire="setType('one-click-service-{{ $serviceName }}')">
+                                <x-slot:title> {{ Str::headline($serviceName) }}</x-slot>
+                                <x-slot:description>
+                                    @if (data_get($service, 'slogan'))
+                                        {{ data_get($service, 'slogan') }}
+                                    @endif
 
-                            </x-slot>
-                            <x-slot:logo>
-                                @if (data_get($service, 'logo'))
-                                    <img class="w-[4.5rem]
+                                </x-slot>
+                                <x-slot:logo>
+                                    @if (data_get($service, 'logo'))
+                                        <img class="w-[4.5rem]
                                     aspect-square h-[4.5rem] p-2 transition-all duration-200 opacity-30 grayscale group-hover:grayscale-0 group-hover:opacity-100"
-                                        src="{{ asset(data_get($service, 'logo')) }}">
-                                @endif
-                            </x-slot:logo>
-                            <x-slot:documentation>
-                                {{ data_get($service, 'documentation') }}
-                            </x-slot>
-                            <x-slot:upgrade>
-                                You need to upgrade Coolify to {{ data_get($service, 'minversion') }} to use this service.
-                            </x-slot>
-                        </x-resource-view>
+                                            src="{{ asset(data_get($service, 'logo')) }}">
+                                    @endif
+                                </x-slot:logo>
+                                <x-slot:documentation>
+                                    {{ data_get($service, 'documentation') }}
+                                </x-slot>
+                                <x-slot:upgrade>
+                                    You need to upgrade Coolify to {{ data_get($service, 'minversion') }} to use this
+                                    service.
+                                </x-slot>
+                            </x-resource-view>
                             {{-- <button class="text-left cursor-not-allowed bg-coolgray-100 box-without-bg" disabled>
                                 <div class="flex flex-col mx-6">
                                     <div class="font-bold">
@@ -215,10 +216,14 @@
                                     @endif
                                 </x-slot>
                                 <x-slot:logo>
-                                    @if (data_get($service, 'logo'))
+                                    @if (file_exists(public_path(data_get($service, 'logo'))))
                                         <img class="w-[4.5rem]
-                                        aspect-square h-[4.5rem] p-2 transition-all duration-200 opacity-30 grayscale group-hover:grayscale-0 group-hover:opacity-100"
+                                    aspect-square h-[4.5rem] p-2 transition-all duration-200 opacity-30 grayscale group-hover:grayscale-0 group-hover:opacity-100"
                                             src="{{ asset(data_get($service, 'logo')) }}">
+                                    @else
+                                        <img class="w-[4.5rem]
+                                    aspect-square h-[4.5rem] p-2 transition-all duration-200 opacity-30 grayscale group-hover:grayscale-0 group-hover:opacity-100"
+                                            src="{{ asset('svgs/unknown.svg') }}">
                                     @endif
                                 </x-slot:logo>
                                 <x-slot:documentation>

resources/views/livewire/server/delete.blade.php

@@ -7,10 +7,10 @@
             back!
         </div>
         @if ($server->definedResources()->count() > 0)
+            <div class="pb-2 text-red-500">You need to delete all resources before deleting this server.</div>
             <x-new-modal disabled isErrorButton buttonTitle="Delete">
                 This server will be deleted. It is not reversible. <br>Please think again.
             </x-new-modal>
-            <div>You need to delete all resources before deleting this server.</div>
         @else
             <x-new-modal isErrorButton buttonTitle="Delete">
                 This server will be deleted. It is not reversible. <br>Please think again.

resources/views/livewire/server/form.blade.php

@@ -47,6 +47,10 @@
                 Validate Server
             </x-forms.button>
         @endif
+        @if ($server->isForceDisabled() && isCloud())
+            <div class="pt-4 font-bold text-red-500">The system has disabled the server because you have exceeded the
+                number of servers for which you have paid.</div>
+        @endif
         <div class="flex flex-col gap-2 pt-4">
             <div class="flex flex-col w-full gap-2 lg:flex-row">
                 <x-forms.input id="server.name" label="Name" required />

resources/views/livewire/server/index.blade.php

@@ -1,18 +1,18 @@
 <div>
     <div class="flex items-start gap-2">
         <h1>Servers</h1>
-        <a  class="text-white hover:no-underline" href="{{ route('server.create') }}">
+        <a class="text-white hover:no-underline" href="{{ route('server.create') }}">
             <x-forms.button class="btn">+ Add</x-forms.button>
         </a>
     </div>
     <div class="subtitle ">All Servers</div>
     <div class="grid gap-2 lg:grid-cols-2">
         @forelse ($servers as $server)
-            <a  href="{{ route('server.show', ['server_uuid' => data_get($server, 'uuid')]) }}"
+            <a href="{{ route('server.show', ['server_uuid' => data_get($server, 'uuid')]) }}"
                 @class([
                     'gap-2 border cursor-pointer box group',
-                    'border-transparent' => $server->settings->is_reachable,
-                    'border-red-500' => !$server->settings->is_reachable,
+                    'border-transparent' => $server->settings->is_reachable && $server->settings->is_usable && !$server->settings->force_disabled,
+                    'border-red-500' => !$server->settings->is_reachable || $server->settings->force_disabled,
                 ])>
                 <div class="flex flex-col mx-6">
                     <div class="font-bold text-white">
@@ -30,6 +30,9 @@
                         @if (!$server->settings->is_usable)
                             <span>Not usable by Coolify</span>
                         @endif
+                        @if ($server->settings->force_disabled)
+                            <span>Disabled by the system</span>
+                        @endif
                     </div>
                 </div>
                 <div class="flex-1"></div>

resources/views/livewire/server/proxy/dynamic-configurations.blade.php

@@ -48,7 +48,6 @@
                         <div wire:loading.remove> No dynamic configurations found.</div>
                     @endif
                 </div>
-
             @endif
         </div>
     </div>

resources/views/livewire/server/proxy/show.blade.php

@@ -1,11 +1,13 @@
 <div>
     <x-server.navbar :server="$server" :parameters="$parameters" />
-    <div class="flex gap-2">
-        <x-server.sidebar :server="$server" :parameters="$parameters" />
-        <div class="w-full">
-            @if ($server->isFunctional())
+    @if ($server->isFunctional())
+        <div class="flex gap-2">
+            <x-server.sidebar :server="$server" :parameters="$parameters" />
+            <div class="w-full">
                 <livewire:server.proxy :server="$server" />
-            @endif
+            </div>
         </div>
-    </div>
+        @else
+        <div>Server is not validated. Validate first.</div>
+    @endif
 </div>

resources/views/livewire/subscription/actions.blade.php

@@ -1,25 +1,40 @@
 <div>
     @if (subscriptionProvider() === 'stripe')
-        <x-forms.button wire:click='stripeCustomerPortal'>Manage My Subscription</x-forms.button>
         <div class="pt-4">
-            <div>Current Plan: <span class="text-warning">{{ data_get(currentTeam(), 'subscription')->type() }}<span>
-            </div>
+            <h2>Your current plan</h2>
+            <div class="pb-4">Tier: <strong
+                    class="text-warning">{{ data_get(currentTeam(), 'subscription')->type() }}</strong></div>
+
             @if (currentTeam()->subscription->stripe_cancel_at_period_end)
                 <div>Subscription is active but on cancel period.</div>
             @else
                 <div>Subscription is active. Last invoice is
                     {{ currentTeam()->subscription->stripe_invoice_paid ? 'paid' : 'not paid' }}.</div>
             @endif
-
-            @if (currentTeam()->subscription->stripe_cancel_at_period_end)
-                <a class="hover:no-underline" href="{{ route('subscription.index') }}"><x-forms.button>Subscribe
-                        again</x-forms.button></a>
+            <div>Number of paid servers: {{ $server_limits }}</div>
+            <div>Currently active servers: {{ currentTeam()->servers->count() }}</div>
+            @if (currentTeam()->serverOverflow())
+                <div class="py-4"><span class="font-bold text-red-500">WARNING:</span> You must delete
+                    {{ currentTeam()->servers->count() - $server_limits }} servers,
+                    or upgrade your subscription. {{ currentTeam()->servers->count() - $server_limits }} servers will be
+                    deactivated.</div>
             @endif
-            <div>To update your subscription (upgrade / downgrade), please <a class="text-white underline"
-                    href="{{ config('coolify.contact') }}" target="_blank">contact us.</a></div>
+            <h2 class="pt-4">Manage your subscription</h2>
+            <div class="pb-4">Cancel, upgrade or downgrade your subscription.</div>
+            <div class="flex gap-2">
+                <x-forms.button wire:click='stripeCustomerPortal'>Go to <svg xmlns="http://www.w3.org/2000/svg"
+                        class="w-12" viewBox="0 0 512 214">
+                        <path fill="#635BFF"
+                            d="M512 110.08c0-36.409-17.636-65.138-51.342-65.138c-33.85 0-54.33 28.73-54.33 64.854c0 42.808 24.179 64.426 58.88 64.426c16.925 0 29.725-3.84 39.396-9.244v-28.445c-9.67 4.836-20.764 7.823-34.844 7.823c-13.796 0-26.027-4.836-27.591-21.618h69.547c0-1.85.284-9.245.284-12.658Zm-70.258-13.511c0-16.071 9.814-22.756 18.774-22.756c8.675 0 17.92 6.685 17.92 22.756h-36.694Zm-90.31-51.627c-13.939 0-22.899 6.542-27.876 11.094l-1.85-8.818h-31.288v165.83l35.555-7.537l.143-40.249c5.12 3.698 12.657 8.96 25.173 8.96c25.458 0 48.64-20.48 48.64-65.564c-.142-41.245-23.609-63.716-48.498-63.716Zm-8.534 97.991c-8.391 0-13.37-2.986-16.782-6.684l-.143-52.765c3.698-4.124 8.818-6.968 16.925-6.968c12.942 0 21.902 14.506 21.902 33.137c0 19.058-8.818 33.28-21.902 33.28ZM241.493 36.551l35.698-7.68V0l-35.698 7.538V36.55Zm0 10.809h35.698v124.444h-35.698V47.36Zm-38.257 10.524L200.96 47.36h-30.72v124.444h35.556V87.467c8.39-10.951 22.613-8.96 27.022-7.396V47.36c-4.551-1.707-21.191-4.836-29.582 10.524Zm-71.112-41.386l-34.702 7.395l-.142 113.92c0 21.05 15.787 36.551 36.836 36.551c11.662 0 20.195-2.133 24.888-4.693V140.8c-4.55 1.849-27.022 8.391-27.022-12.658V77.653h27.022V47.36h-27.022l.142-30.862ZM35.982 83.484c0-5.546 4.551-7.68 12.09-7.68c10.808 0 24.461 3.272 35.27 9.103V51.484c-11.804-4.693-23.466-6.542-35.27-6.542C19.2 44.942 0 60.018 0 85.192c0 39.252 54.044 32.995 54.044 49.92c0 6.541-5.688 8.675-13.653 8.675c-11.804 0-26.88-4.836-38.827-11.378v33.849c13.227 5.689 26.596 8.106 38.827 8.106c29.582 0 49.92-14.648 49.92-40.106c-.142-42.382-54.329-34.845-54.329-50.774Z" />
+                    </svg></x-forms.button>
+            </div>
+        </div>
+        <div class="pt-4">
+            If you have any problem, please <a class="text-white underline" href="{{ config('coolify.contact') }}"
+                target="_blank">contact us.</a>
         </div>
     @endif
-    @if (subscriptionProvider() === 'lemon')
+    {{-- @if (subscriptionProvider() === 'lemon')
         <div>Status: {{ currentTeam()->subscription->lemon_status }}</div>
         <div>Type: {{ currentTeam()->subscription->lemon_variant_name }}</div>
         @if (currentTeam()->subscription->lemon_status === 'cancelled')
@@ -49,6 +64,5 @@
                         Subscription</x-forms.button></a>
             </div>
         </div>
-    @endif
-
+    @endif --}}
 </div>

resources/views/livewire/subscription/pricing-plans.blade.php

@@ -22,16 +22,13 @@
             </x-forms.button>
         </x-slot:pro>
         <x-slot:ultimate>
-            <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-ultimate"
-                class="w-full h-10 buyme"><a class="text-white hover:no-underline" href="{{ config('coolify.contact') }}"
-                    target="_blank">
-                    Contact Us</a>
+            <x-forms.button x-show="selected === 'monthly'" x-cloak aria-describedby="tier-ultimate" class="w-full h-10 buyme"
+                wire:click="subscribeStripe('ultimate-monthly')">
+                {{ $isTrial ? 'Start Trial' : 'Subscribe' }}
             </x-forms.button>
 
-            <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-ultimate"
-                class="w-full h-10 buyme"><a class="text-white hover:no-underline" href="{{ config('coolify.contact') }}"
-                    target="_blank">
-                    Contact Us</a>
+            <x-forms.button x-show="selected === 'yearly'" x-cloak aria-describedby="tier-ultimate" class="w-full h-10 buyme"
+                wire:click="subscribeStripe('ultimate-yearly')"> {{ $isTrial ? 'Start Trial' : 'Subscribe' }}
             </x-forms.button>
         </x-slot:ultimate>
     @endif

resources/views/livewire/subscription/show.blade.php

@@ -0,0 +1,7 @@
+<div>
+    <div>
+        <h1>Subscription</h1>
+        <div>Here you can see and manage your subscription.</div>
+    </div>
+    <livewire:subscription.actions />
+</div>

resources/views/livewire/team/index.blade.php

@@ -14,19 +14,6 @@
         </div>
     </form>
 
-    @if (isCloud())
-        <div class="pb-8">
-            <h2>Subscription</h2>
-            @if (data_get(currentTeam(), 'subscription'))
-                <livewire:subscription.actions />
-            @else
-                <x-forms.button class="mt-4"><a class="text-white hover:no-underline"
-                        href="{{ route('subscription.index') }}">Subscribe Now</a>
-                </x-forms.button>
-            @endif
-
-        </div>
-    @endif
     <div>
         <h2>Danger Zone</h2>
         <div class="pb-4">Woah. I hope you know what are you doing.</div>
@@ -36,7 +23,7 @@
         @elseif(auth()->user()->teams()->get()->count() === 1)
             <div>You can't delete your last team.</div>
         @elseif(currentTeam()->subscription && currentTeam()->subscription?->lemon_status !== 'cancelled')
-            <div>Please cancel your subscription before delete this team (Manage My Subscription).</div>
+            <div>Please cancel your subscription <a class="text-white underline" href="{{route('subscription.show')}}">here</a> before delete this team.</div>
         @else
             @if (currentTeam()->isEmpty())
                 <div class="pb-4">This will delete your team. Beware! There is no coming back!</div>

resources/views/livewire/team/invitations.blade.php

@@ -1,39 +1,55 @@
 <div>
     @if ($invitations->count() > 0)
-        <h4 class="pb-2">Pending Invitations</h4>
-        <div class="overflow-x-auto">
-            <table>
-                <thead>
-                    <tr>
-                        <th>Email</th>
-                        <th>Via</th>
-                        <th>Role</th>
-                        <th>Invitation Link</th>
-                        <th>Actions</th>
-                    </tr>
-                </thead>
-                <tbody x-data>
-                    @foreach ($invitations as $invite)
-                        <tr>
-                            <td>{{ $invite->email }}</td>
-                            <td>{{ $invite->via }}</td>
-                            <td>{{ $invite->role }}</td>
-                            <td class="flex gap-2" x-data="checkProtocol">
-                                <template x-if="isHttps">
-                                    <x-forms.button x-on:click="copyToClipboard('{{ $invite->link }}')">Copy Invitation
-                                        Link</x-forms.button>
-                                </template>
-                                <x-forms.input id="null" type="password" value="{{ $invite->link }}" />
-                            </td>
-                            <td>
-                                <x-forms.button wire:click.prevent='deleteInvitation({{ $invite->id }})'>Revoke
-                                    Invitation
-                                </x-forms.button>
-                            </td>
-                        </tr>
-                    @endforeach
-                </tbody>
-            </table>
+        <h2 class="pb-2">Pending Invitations</h2>
+        <div class="flex flex-col">
+            <div class="flex flex-col">
+                <div class="overflow-x-auto">
+                    <div class="inline-block min-w-full">
+                        <div class="overflow-hidden">
+                            <table class="min-w-full divide-y divide-coolgray-400">
+                                <thead>
+                                    <tr class="text-neutral-500">
+                                        <th class="px-5 py-3 text-xs font-medium text-left uppercase">Email
+                                        </th>
+                                        <th class="px-5 py-3 text-xs font-medium text-left uppercase">
+                                            Via</th>
+                                        <th class="px-5 py-3 text-xs font-medium text-left uppercase">Role</th>
+                                        <th class="px-5 py-3 text-xs font-medium text-left uppercase">Invitation Link
+                                        </th>
+                                        <th class="px-5 py-3 text-xs font-medium text-left uppercase">Actions
+                                        </th>
+                                    </tr>
+                                </thead>
+                                <tbody class="divide-y divide-coolgray-400">
+                                    @foreach ($invitations as $invite)
+                                        <tr class="text-white bg-coolblack hover:bg-coolgray-100/40">
+                                            <td class="px-5 py-4 text-sm whitespace-nowrap">{{ $invite->email }}</td>
+                                            <td class="px-5 py-4 text-sm whitespace-nowrap">{{ $invite->via }}</td>
+                                            <td class="px-5 py-4 text-sm whitespace-nowrap">{{ $invite->role }}</td>
+                                            <td class="px-5 py-4 text-sm whitespace-nowrap" x-data="checkProtocol">
+                                                <template x-if="isHttps">
+                                                    <x-forms.button
+                                                        x-on:click="copyToClipboard('{{ $invite->link }}')">Copy
+                                                        Invitation
+                                                        Link</x-forms.button>
+                                                </template>
+                                                <x-forms.input id="null" type="password"
+                                                    value="{{ $invite->link }}" />
+                                            </td>
+                                            <td class="px-5 py-4 text-sm whitespace-nowrap">
+                                                <x-forms.button
+                                                    wire:click.prevent='deleteInvitation({{ $invite->id }})'>Revoke
+                                                    Invitation
+                                                </x-forms.button>
+                                            </td>
+                                        </tr>
+                                    @endforeach
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
     @endif
 </div>

resources/views/livewire/team/invite-link.blade.php

@@ -2,6 +2,7 @@
     <form wire:submit='viaLink' class="flex items-center gap-2">
         <x-forms.input id="email" type="email" name="email" placeholder="Email" />
         <x-forms.select id="role" name="role">
+            <option value="owner">Owner</option>
             <option value="admin">Admin</option>
             <option value="member">Member</option>
         </x-forms.select>

resources/views/livewire/team/member.blade.php

@@ -1,25 +1,47 @@
-<tr>
-    <td>
-        {{ $member->name }}</th>
-    <td>{{ $member->email }}</td>
-    <td>
-        {{ data_get($member, 'pivot.role') }}</td>
-    <td>
-        {{-- TODO: This is not good --}}
+<tr @class([
+    'text-white bg-coolblack hover:bg-coolgray-100',
+    'bg-coolgray-100' => $member->id == auth()->user()->id,
+])>
+    <td class="px-5 py-4 text-sm whitespace-nowrap">
+        {{ $member->name }}
+    </td>
+    <td class="px-5 py-4 text-sm whitespace-nowrap">
+        {{ $member->email }}
+    </td>
+    <td class="px-5 py-4 text-sm whitespace-nowrap">
+        {{ data_get($member, 'pivot.role') }}
+    </td>
+    <td class="px-5 py-4 text-sm whitespace-nowrap">
         @if (auth()->user()->isAdminFromSession())
             @if ($member->id !== auth()->user()->id)
-                @if (data_get($member, 'pivot.role') !== 'owner')
-                    @if (data_get($member, 'pivot.role') !== 'admin')
-                        <x-forms.button wire:click="makeAdmin">Convert to Admin</x-forms.button>
-                    @else
-                        <x-forms.button wire:click="makeReadonly">Convert to Member</x-forms.button>
+                @if (auth()->user()->isOwner())
+                    @if (data_get($member, 'pivot.role') === 'owner')
+                        <x-forms.button wire:click="makeAdmin">To Admin</x-forms.button>
+                        <x-forms.button wire:click="makeReadonly">To Member</x-forms.button>
+                        <x-forms.button isError wire:click="remove">Remove</x-forms.button>
+                    @endif
+                    @if (data_get($member, 'pivot.role') === 'admin')
+                        <x-forms.button wire:click="makeOwner">To Owner</x-forms.button>
+                        <x-forms.button wire:click="makeReadonly">To Member</x-forms.button>
+                        <x-forms.button isError wire:click="remove">Remove</x-forms.button>
+                    @endif
+                    @if (data_get($member, 'pivot.role') === 'member')
+                        <x-forms.button wire:click="makeOwner">To Owner</x-forms.button>
+                        <x-forms.button wire:click="makeAdmin">To Admin</x-forms.button>
+                        <x-forms.button isError wire:click="remove">Remove</x-forms.button>
+                    @endif
+                @elseif (auth()->user()->isAdmin())
+                    @if (data_get($member, 'pivot.role') === 'admin')
+                        <x-forms.button wire:click="makeReadonly">To Member</x-forms.button>
+                        <x-forms.button isError wire:click="remove">Remove</x-forms.button>
+                    @endif
+                    @if (data_get($member, 'pivot.role') === 'member')
+                        <x-forms.button wire:click="makeAdmin">To Admin</x-forms.button>
+                        <x-forms.button isError wire:click="remove">Remove</x-forms.button>
                     @endif
-                    <x-forms.button wire:click="remove">Remove</x-forms.button>
-                @else
-                    <x-forms.button disabled>Remove</x-forms.button>
                 @endif
             @else
-                <x-forms.button disabled>Remove</x-forms.button>
+                <div class="text-neutral-500">(This is you)</div>
             @endif
         @endif
     </td>

resources/views/livewire/team/member/index.blade.php

@@ -1,29 +1,39 @@
 <div>
     <x-team.navbar />
     <h2>Members</h2>
-    <div class="pt-4 overflow-hidden">
-        <table>
-            <thead>
-                <tr>
-                    <th>Name</th>
-                    <th>Email</th>
-                    <th>Role</th>
-                    <th>Actions</th>
-                </tr>
-            </thead>
-            <tbody>
-                @foreach (currentTeam()->members->sortBy('name') as $member)
-                    <livewire:team.member :member="$member" :wire:key="$member->id" />
-                @endforeach
-            </tbody>
-        </table>
+
+    <div class="flex flex-col">
+        <div class="flex flex-col">
+            <div class="overflow-x-auto">
+                <div class="inline-block min-w-full">
+                    <div class="overflow-hidden">
+                        <table class="min-w-full divide-y divide-coolgray-400">
+                            <thead>
+                                <tr class="text-neutral-500">
+                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">Name
+                                    </th>
+                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">Email</th>
+                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">Role</th>
+                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">Actions</th>
+                                </tr>
+                            </thead>
+                            <tbody class="divide-y divide-coolgray-400">
+                                @foreach (currentTeam()->members as $member)
+                                    <livewire:team.member :member="$member" :wire:key="$member->id" />
+                                @endforeach
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
     </div>
     @if (auth()->user()->isAdminFromSession())
         <div class="py-4">
             @if (is_transactional_emails_active())
-                <h3 class="pb-4">Invite a new member</h3>
+                <h2 class="pb-4">Invite New Member</h2>
             @else
-                <h3>Invite a new member</h3>
+                <h2>Invite New Member</h2>
                 @if (isInstanceAdmin())
                     <div class="pb-4 text-xs text-warning">You need to configure (as root team) <a href="/settings#smtp"
                             class="underline text-warning">Transactional

routes/api.php

@@ -1,8 +1,8 @@
 <?php
 
-use App\Http\Controllers\Api\Deploy;
-use App\Http\Controllers\Api\Project;
-use App\Http\Controllers\Api\Server;
+use App\Http\Controllers\Api\APIDeploy as Deploy;
+use App\Http\Controllers\Api\APIProject as Project;
+use App\Http\Controllers\Api\APIServer as Server;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Route;

routes/web.php

@@ -1,6 +1,5 @@
 <?php
 
-use App\Http\Controllers\Api\Server as ApiServer;
 use App\Models\GitlabApp;
 use App\Models\PrivateKey;
 use App\Models\Server;
@@ -72,6 +71,7 @@ use App\Livewire\Server\Proxy\Show as ProxyShow;
 use App\Livewire\Server\Proxy\Logs as ProxyLogs;
 use App\Livewire\Source\Github\Change as GitHubChange;
 use App\Livewire\Subscription\Index as SubscriptionIndex;
+use App\Livewire\Subscription\Show as SubscriptionShow;
 
 use App\Livewire\Tags\Index as TagsIndex;
 use App\Livewire\Tags\Show as TagsShow;
@@ -110,7 +110,8 @@ Route::middleware(['auth', 'verified'])->group(function () {
     Route::get('/', Dashboard::class)->name('dashboard');
     Route::get('/boarding', BoardingIndex::class)->name('boarding');
 
-    Route::get('/subscription', SubscriptionIndex::class)->name('subscription.index');
+    Route::get('/subscription', SubscriptionShow::class)->name('subscription.show');
+    Route::get('/subscription/new', SubscriptionIndex::class)->name('subscription.index');
 
     Route::get('/settings', SettingsIndex::class)->name('settings.index');
     Route::get('/settings/license', SettingsLicense::class)->name('settings.license');

routes/webhooks.php

@@ -3,6 +3,7 @@
 use App\Enums\ProcessStatus;
 use App\Jobs\ApplicationPullRequestUpdateJob;
 use App\Jobs\GithubAppPermissionJob;
+use App\Jobs\ServerLimitCheckJob;
 use App\Jobs\SubscriptionInvoiceFailedJob;
 use App\Jobs\SubscriptionTrialEndedJob;
 use App\Jobs\SubscriptionTrialEndsSoonJob;
@@ -816,9 +817,7 @@ Route::post('/payments/stripe/events', function () {
                     Sleep::for(5)->seconds();
                     $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
                 }
-
                 $subscription->update([
-                    'stripe_plan_id' => $planId,
                     'stripe_invoice_paid' => true,
                 ]);
                 break;
@@ -877,6 +876,15 @@ Route::post('/payments/stripe/events', function () {
                 $alreadyCancelAtPeriodEnd = data_get($subscription, 'stripe_cancel_at_period_end');
                 $feedback = data_get($data, 'cancellation_details.feedback');
                 $comment = data_get($data, 'cancellation_details.comment');
+                $lookup_key = data_get($data, 'items.data.0.price.lookup_key');
+                if (str($lookup_key)->contains('ultimate')) {
+                    $quantity = data_get($data, 'items.data.0.quantity', 10);
+                    $team = data_get($subscription, 'team');
+                    $team->update([
+                        'custom_server_limit' => $quantity,
+                    ]);
+                    ServerLimitCheckJob::dispatch($team);
+                }
                 $subscription->update([
                     'stripe_feedback' => $feedback,
                     'stripe_comment' => $comment,

templates/compose/appsmith.yaml

@@ -7,11 +7,11 @@ services:
   appsmith:
     image: index.docker.io/appsmith/appsmith-ce:latest
     environment:
-      - SERVICE_FQDN
+      - SERVICE_FQDN_APPSMITH
       - APPSMITH_MAIL_ENABLED=false
       - APPSMITH_DISABLE_TELEMETRY=true
       - APPSMITH_DISABLE_INTERCOM=true
-      - APPSMITH_SENTRY_DSN=  
+      - APPSMITH_SENTRY_DSN=
       - APPSMITH_SMART_LOOK_ID=
     volumes:
       - stacks-data:/appsmith-stacks

templates/compose/firefly.yaml

@@ -0,0 +1,69 @@
+# documentation: https://firefly-iii.org
+# slogan: A personal finances manager that can help you save money.
+# tags: finance, money, personal, manager
+# logo: svgs/firefly.svg
+
+services:
+  firefly:
+    image: fireflyiii/core:latest
+    environment:
+      - SERVICE_FQDN_FIREFLY
+      - APP_KEY=$SERVICE_BASE64_APPKEY
+      - DB_HOST=mysql
+      - DB_PORT=3306
+      - DB_CONNECTION=mysql
+      - DB_DATABASE=${MYSQL_DATABASE:-firefly}
+      - DB_USERNAME=$SERVICE_USER_MYSQL
+      - DB_PASSWORD=$SERVICE_PASSWORD_MYSQL
+      - STATIC_CRON_TOKEN=$SERVICE_BASE64_CRONTOKEN
+      - TRUSTED_PROXIES=*
+    volumes:
+      - firefly-upload:/var/www/html/storage/upload
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8080"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
+    depends_on:
+      mysql:
+        condition: service_healthy
+  mysql:
+    image: mariadb:lts
+    environment:
+      - MYSQL_USER=${SERVICE_USER_MYSQL}
+      - MYSQL_PASSWORD=${SERVICE_PASSWORD_MYSQL}
+      - MYSQL_DATABASE=${MYSQL_DATABASE:-firefly}
+      - MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_MYSQLROOT}
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "mysqladmin",
+          "ping",
+          "-h",
+          "localhost",
+          "-uroot",
+          "-p${SERVICE_PASSWORD_MYSQLROOT}",
+        ]
+      interval: 5s
+      timeout: 20s
+      retries: 10
+    volumes:
+      - firefly-mysql-data:/var/lib/mysql
+  cron:
+    image: alpine
+    entrypoint: ["/entrypoint.sh"]
+    volumes:
+      - type: bind
+        source: ./entrypoint.sh
+        target: /entrypoint.sh
+        content: |
+          #!/bin/sh
+          # Substitute the environment variable into the cron command
+          CRON_COMMAND="0 3 * * * wget -qO- http://firefly:8080/api/v1/cron/${STATIC_CRON_TOKEN}"
+          # Add the cron command to the crontab
+          echo "$CRON_COMMAND" | crontab -
+          # Start the cron daemon in the foreground with logging to stdout
+          crond -f -L /dev/stdout
+    environment:
+      - STATIC_CRON_TOKEN=$SERVICE_BASE64_CRONTOKEN

templates/compose/invoice-ninja.yaml

@@ -0,0 +1,100 @@
+# ignore: true
+# documentation: https://invoiceninja.github.io/selfhost.html
+# slogan: The leading open-source invoicing platform
+# tags: invoicing, billing, accounting, finance, self-hosted
+
+services:
+  invoice-ninja:
+    image: invoiceninja/invoiceninja:5
+    environment:
+      - SERVICE_FQDN_INVOICENINJA
+      - APP_ENV=production
+      - APP_URL=${SERVICE_FQDN_INVOICENINJA}
+      - APP_KEY=${SERVICE_BASE64_INVOICENINJA}
+      - APP_DEBUG=false
+      - REQUIRE_HTTPS=false
+      - PHANTOMJS_PDF_GENERATION=false
+      - PDF_GENERATOR=snappdf
+      - TRUSTED_PROXIES=*
+      - QUEUE_CONNECTION=database
+      - DB_HOST=mysql
+      - DB_PORT=3306
+      - DB_DATABASE=${MYSQL_DATABASE:-invoice_ninja}
+      - DB_USERNAME=${SERVICE_USER_MYSQL}
+      - DB_PASSWORD=${SERVICE_PASSWORD_MYSQL}
+    volumes:
+      - invoice-ninja-public:/var/www/app/public
+      - invoice-ninja-storage:/var/www/app/storage
+      - type: bind
+        source: ./php.ini
+        target: /usr/local/etc/php/php.ini
+        content: |
+          session.auto_start = Off
+          short_open_tag = Off
+
+          error_reporting = E_ALL & ~E_NOTICE & ~E_WARNING & ~E_STRICT & ~E_DEPRECATED
+
+          ; opcache.enable=1
+          ; opcache.preload=/srv/www/invoiceninja/current/preload.php
+          ; opcache.preload_user=www-data
+
+          ; ; The OPcache shared memory storage size.
+          ; opcache.max_accelerated_files=300000
+          ; opcache.validate_timestamps=1
+          ; opcache.revalidate_freq=30
+          ; opcache.jit_buffer_size=256M
+          ; opcache.jit=1205
+          ; opcache.memory_consumption=1024M
+
+
+          post_max_size = 60M
+          upload_max_filesize = 50M
+          memory_limit=512M
+      - type: bind
+        source: ./php-cli.ini
+        target: /usr/local/etc/php/php-cli.ini
+        content: |
+          session.auto_start = Off
+          short_open_tag = Off
+
+          error_reporting = E_ALL & ~E_NOTICE & ~E_WARNING & ~E_STRICT & ~E_DEPRECATED
+
+          ; opcache.enable_cli=1
+          ; opcache.fast_shutdown=1
+          ; opcache.memory_consumption=256
+          ; opcache.interned_strings_buffer=8
+          ; opcache.max_accelerated_files=4000
+          ; opcache.revalidate_freq=60
+          ; # http://symfony.com/doc/current/performance.html
+          ; realpath_cache_size = 4096K
+          ; realpath_cache_ttl = 600
+
+          memory_limit = 2G
+          post_max_size = 60M
+          upload_max_filesize = 50M
+    depends_on:
+      mysql:
+        condition: service_healthy
+  mysql:
+    image: mariadb:lts
+    environment:
+      - MYSQL_USER=${SERVICE_USER_MYSQL}
+      - MYSQL_PASSWORD=${SERVICE_PASSWORD_MYSQL}
+      - MYSQL_DATABASE=${MYSQL_DATABASE:-invoice_ninja}
+      - MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_MYSQLROOT}
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "mysqladmin",
+          "ping",
+          "-h",
+          "localhost",
+          "-uroot",
+          "-p${SERVICE_PASSWORD_MYSQLROOT}",
+        ]
+      interval: 5s
+      timeout: 20s
+      retries: 10
+    volumes:
+      - invoice-ninja-mysql-data:/var/lib/mysql

templates/service-templates.json

@@ -2,7 +2,7 @@
     "appsmith": {
         "documentation": "https:\/\/appsmith.com",
         "slogan": "Appsmith is low-code application platform for building internal tools.",
-        "compose": "c2VydmljZXM6CiAgYXBwc21pdGg6CiAgICBpbWFnZTogJ2luZGV4LmRvY2tlci5pby9hcHBzbWl0aC9hcHBzbWl0aC1jZTpsYXRlc3QnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE4KICAgICAgLSBBUFBTTUlUSF9NQUlMX0VOQUJMRUQ9ZmFsc2UKICAgICAgLSBBUFBTTUlUSF9ESVNBQkxFX1RFTEVNRVRSWT10cnVlCiAgICAgIC0gQVBQU01JVEhfRElTQUJMRV9JTlRFUkNPTT10cnVlCiAgICAgIC0gQVBQU01JVEhfU0VOVFJZX0RTTj0KICAgICAgLSBBUFBTTUlUSF9TTUFSVF9MT09LX0lEPQogICAgdm9sdW1lczoKICAgICAgLSAnc3RhY2tzLWRhdGE6L2FwcHNtaXRoLXN0YWNrcycKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gTk9ORQo=",
+        "compose": "c2VydmljZXM6CiAgYXBwc21pdGg6CiAgICBpbWFnZTogJ2luZGV4LmRvY2tlci5pby9hcHBzbWl0aC9hcHBzbWl0aC1jZTpsYXRlc3QnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fQVBQU01JVEgKICAgICAgLSBBUFBTTUlUSF9NQUlMX0VOQUJMRUQ9ZmFsc2UKICAgICAgLSBBUFBTTUlUSF9ESVNBQkxFX1RFTEVNRVRSWT10cnVlCiAgICAgIC0gQVBQU01JVEhfRElTQUJMRV9JTlRFUkNPTT10cnVlCiAgICAgIC0gQVBQU01JVEhfU0VOVFJZX0RTTj0KICAgICAgLSBBUFBTTUlUSF9TTUFSVF9MT09LX0lEPQogICAgdm9sdW1lczoKICAgICAgLSAnc3RhY2tzLWRhdGE6L2FwcHNtaXRoLXN0YWNrcycKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gTk9ORQo=",
         "tags": [
             "lowcode",
             "nocode",
@@ -192,6 +192,19 @@
         "logo": "svgs\/filebrowser.svg",
         "minversion": "0.0.0"
     },
+    "firefly": {
+        "documentation": "https:\/\/firefly-iii.org",
+        "slogan": "A personal finances manager that can help you save money.",
+        "compose": "c2VydmljZXM6CiAgZmlyZWZseToKICAgIGltYWdlOiAnZmlyZWZseWlpaS9jb3JlOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9GSVJFRkxZCiAgICAgIC0gQVBQX0tFWT0kU0VSVklDRV9CQVNFNjRfQVBQS0VZCiAgICAgIC0gREJfSE9TVD1teXNxbAogICAgICAtIERCX1BPUlQ9MzMwNgogICAgICAtIERCX0NPTk5FQ1RJT049bXlzcWwKICAgICAgLSAnREJfREFUQUJBU0U9JHtNWVNRTF9EQVRBQkFTRTotZmlyZWZseX0nCiAgICAgIC0gREJfVVNFUk5BTUU9JFNFUlZJQ0VfVVNFUl9NWVNRTAogICAgICAtIERCX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX01ZU1FMCiAgICAgIC0gU1RBVElDX0NST05fVE9LRU49JFNFUlZJQ0VfQkFTRTY0X0NST05UT0tFTgogICAgICAtICdUUlVTVEVEX1BST1hJRVM9KicKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2ZpcmVmbHktdXBsb2FkOi92YXIvd3d3L2h0bWwvc3RvcmFnZS91cGxvYWQnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gY3VybAogICAgICAgIC0gJy1mJwogICAgICAgIC0gJ2h0dHA6Ly9sb2NhbGhvc3Q6ODA4MCcKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAogICAgZGVwZW5kc19vbjoKICAgICAgbXlzcWw6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICBteXNxbDoKICAgIGltYWdlOiAnbWFyaWFkYjpsdHMnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnTVlTUUxfVVNFUj0ke1NFUlZJQ0VfVVNFUl9NWVNRTH0nCiAgICAgIC0gJ01ZU1FMX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9NWVNRTH0nCiAgICAgIC0gJ01ZU1FMX0RBVEFCQVNFPSR7TVlTUUxfREFUQUJBU0U6LWZpcmVmbHl9JwogICAgICAtICdNWVNRTF9ST09UX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9NWVNRTFJPT1R9JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIG15c3FsYWRtaW4KICAgICAgICAtIHBpbmcKICAgICAgICAtICctaCcKICAgICAgICAtIGxvY2FsaG9zdAogICAgICAgIC0gJy11cm9vdCcKICAgICAgICAtICctcCR7U0VSVklDRV9QQVNTV09SRF9NWVNRTFJPT1R9JwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCiAgICB2b2x1bWVzOgogICAgICAtICdmaXJlZmx5LW15c3FsLWRhdGE6L3Zhci9saWIvbXlzcWwnCiAgY3JvbjoKICAgIGltYWdlOiBhbHBpbmUKICAgIGVudHJ5cG9pbnQ6CiAgICAgIC0gL2VudHJ5cG9pbnQuc2gKICAgIHZvbHVtZXM6CiAgICAgIC0KICAgICAgICB0eXBlOiBiaW5kCiAgICAgICAgc291cmNlOiAuL2VudHJ5cG9pbnQuc2gKICAgICAgICB0YXJnZXQ6IC9lbnRyeXBvaW50LnNoCiAgICAgICAgY29udGVudDogIiMhL2Jpbi9zaFxuIyBTdWJzdGl0dXRlIHRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZSBpbnRvIHRoZSBjcm9uIGNvbW1hbmRcbkNST05fQ09NTUFORD1cIjAgMyAqICogKiB3Z2V0IC1xTy0gaHR0cDovL2ZpcmVmbHk6ODA4MC9hcGkvdjEvY3Jvbi8ke1NUQVRJQ19DUk9OX1RPS0VOfVwiXG4jIEFkZCB0aGUgY3JvbiBjb21tYW5kIHRvIHRoZSBjcm9udGFiXG5lY2hvIFwiJENST05fQ09NTUFORFwiIHwgY3JvbnRhYiAtXG4jIFN0YXJ0IHRoZSBjcm9uIGRhZW1vbiBpbiB0aGUgZm9yZWdyb3VuZCB3aXRoIGxvZ2dpbmcgdG8gc3Rkb3V0XG5jcm9uZCAtZiAtTCAvZGV2L3N0ZG91dCIKICAgIGVudmlyb25tZW50OgogICAgICAtIFNUQVRJQ19DUk9OX1RPS0VOPSRTRVJWSUNFX0JBU0U2NF9DUk9OVE9LRU4K",
+        "tags": [
+            "finance",
+            "money",
+            "personal",
+            "manager"
+        ],
+        "logo": "svgs\/firefly.svg",
+        "minversion": "0.0.0"
+    },
     "formbricks": {
         "documentation": "https:\/\/formbricks.com",
         "slogan": "Open Source Experience Management",

tests/Feature/DockerRunTest.php

@@ -8,6 +8,15 @@ test('ConvertCapAdd', function () {
     ])->ray();
 });
 
+test('ConvertIp', function () {
+    $input = '--cap-add=NET_ADMIN --cap-add=NET_RAW --cap-add SYS_ADMIN --ip 127.0.0.1 --ip 127.0.0.2';
+    $output = convert_docker_run_to_compose($input);
+    expect($output)->toBe([
+        'cap_add' => ['NET_ADMIN', 'NET_RAW', 'SYS_ADMIN'],
+        'ip' => ['127.0.0.1', '127.0.0.2']
+    ])->ray();
+});
+
 test('ConvertPrivilegedAndInit', function () {
     $input = '---privileged --init';
     $output = convert_docker_run_to_compose($input);

versions.json

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