Merge pull request #2205 from coollabsio/next

v4.0.0-beta.278
coollabsio · May 16, 2024 · 5700f2f · 5700f2f
2 parents b528a0f + c5ca6ab
commit 5700f2f
Show file tree

Hide file tree

Showing 56 changed files with 716 additions and 562 deletions.
diff --git a/README.md b/README.md
@@ -35,6 +35,10 @@ Special thanks to our biggest sponsor, [CCCareers](https://cccareers.org/)!
 ## Github Sponsors ($40+)
 <a href="https://bc.direct"><img width="60px" alt="BC Direct" src="https://github.com/coollabsio/coolify/assets/5845193/a4063c41-95ed-4a32-8814-cd1475572e37"/></a>
 <a href="https://typebot.io/?utm_source=coolify.io"><img src="https://pbs.twimg.com/profile_images/1509194008366657543/9I-C7uWT_400x400.jpg" width="60px" alt="typebot"/></a>
+<a href="https://www.quantcdn.io/?utm_source=coolify.io"><img src="https://github.com/quantcdn.png" width="60px" alt="QuantCDN"/></a> 
+<a href="https://www.runpod.io/?utm_source=coolify.io">
+<svg style="width:60px;height:60px;background:#fff;" xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="0 0 200 200"><g><path d="M74.5 51.1c-25.4 14.9-27 16-29.6 20.2-1.8 3-1.9 5.3-1.9 32.3 0 21.7.3 29.4 1.3 30.6 1.9 2.5 46.7 27.9 48.5 27.6 1.5-.3 1.7-3.1 2-27.7.2-21.9 0-27.8-1.1-29.5-.8-1.2-9.9-6.8-20.2-12.6-10.3-5.8-19.4-11.5-20.2-12.7-1.8-2.6-.9-5.9 1.8-7.4 1.6-.8 6.3 0 21.8 4C87.8 78.7 98 81 99.6 81c4.4 0 49.9-25.9 49.9-28.4 0-1.6-3.4-2.8-24-8.2-13.2-3.5-25.1-6.3-26.5-6.3-1.4.1-12.4 5.9-24.5 13z"></path><path d="m137.2 68.1-3.3 2.1 6.3 3.7c3.5 2 6.3 4.3 6.3 5.1 0 .9-8 6.1-19.4 12.6-10.6 6-20 11.9-20.7 12.9-1.2 1.6-1.4 7.2-1.2 29.4.3 24.8.5 27.6 2 27.9 1.8.3 46.6-25.1 48.6-27.6.9-1.2 1.2-8.8 1.2-30.2s-.3-29-1.2-30.2c-1.6-1.9-12.1-7.8-13.9-7.8-.8 0-2.9 1-4.7 2.1z"></path></g></svg></a>
+<a href="https://www.flint.sh/en/home?utm_source=coolify.io"> <img src="https://github.com/Flint-company.png" width="60px" alt="FlintCompany"/></a>
 <a href="https://americancloud.com/?utm_source=coolify.io"><img src="https://github.com/American-Cloud.png" width="60px" alt="American Cloud"/></a>
 <a href="https://cryptojobslist.com/?utm_source=coolify.io"><img src="https://github.com/cryptojobslist.png" width="60px" alt="CryptoJobsList" /></a>
 <a href="https://www.uxwizz.com/?utm_source=coolify.io"><img width="60px" alt="UXWizz" src="https://github.com/UXWizz.png"/></a>
@@ -62,6 +66,7 @@ Special thanks to our biggest sponsor, [CCCareers](https://cccareers.org/)!
 <a href="https://opencollective.com/coollabsio/organization/8/website"><img src="https://opencollective.com/coollabsio/organization/8/avatar.svg"></a>
 <a href="https://opencollective.com/coollabsio/organization/9/website"><img src="https://opencollective.com/coollabsio/organization/9/avatar.svg"></a>
 
+
 ## Individuals
 
 <a href="https://opencollective.com/coollabsio"><img src="https://opencollective.com/coollabsio/individuals.svg?width=890"></a>

diff --git a/app/Actions/Docker/GetContainersStatus.php b/app/Actions/Docker/GetContainersStatus.php
@@ -339,7 +339,7 @@ private function sentinel()
                 instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
             }
         } catch (\Exception $e) {
-            send_internal_notification("ContainerStatusJob failed on ({$this->server->id}) with: " . $e->getMessage());
+            // send_internal_notification("ContainerStatusJob failed on ({$this->server->id}) with: " . $e->getMessage());
             ray($e->getMessage());
             return handleError($e);
         }

diff --git a/app/Console/Commands/AdminRemoveUser.php b/app/Console/Commands/AdminRemoveUser.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Server;
+use App\Models\User;
+use Illuminate\Console\Command;
+
+class AdminRemoveUser extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'admin:remove-user {email}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Remove User from database';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        try {
+            $email = $this->argument('email');
+            $confirm = $this->confirm('Are you sure you want to remove user with email: ' . $email . '?');
+            if (!$confirm) {
+                $this->info('User removal cancelled.');
+                return;
+            }
+            $this->info("Removing user with email: $email");
+            $user = User::whereEmail($email)->firstOrFail();
+            $teams = $user->teams;
+            foreach ($teams as $team) {
+                if ($team->members->count() > 1) {
+                    $this->error('User is a member of a team with more than one member. Please remove user from team first.');
+                    return;
+                }
+                $team->delete();
+            }
+            $user->delete();
+        } catch (\Exception $e) {
+            $this->error('Failed to remove user.');
+            $this->error($e->getMessage());
+            return;
+        }
+    }
+}
diff --git a/app/Console/Commands/Cloud.php b/app/Console/Commands/Cloud.php
diff --git a/app/Console/Commands/RootResetPassword.php b/app/Console/Commands/RootResetPassword.php
@@ -29,7 +29,6 @@ class RootResetPassword extends Command
      */
     public function handle()
     {
-        //
         $this->info('You are about to reset the root password.');
         $password = password('Give me a new password for root user: ');
         $passwordAgain = password('Again');

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -18,6 +18,7 @@
 use App\Models\Team;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+use Illuminate\Support\Sleep;
 
 class Kernel extends ConsoleKernel
 {
@@ -76,13 +77,28 @@ private function check_resources($schedule)
             $containerServers = $servers->where('settings.is_swarm_worker', false)->where('settings.is_build_server', false);
         }
         foreach ($containerServers as $server) {
-            $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
+            $schedule->job(new ContainerStatusJob($server))->everyTwoMinutes()->onOneServer()->before(function () {
+                if (isCloud()) {
+                    $wait = rand(5, 20);
+                    Sleep::for($wait)->seconds();
+                }
+            });
             if ($server->isLogDrainEnabled()) {
-                $schedule->job(new CheckLogDrainContainerJob($server))->everyMinute()->onOneServer();
+                $schedule->job(new CheckLogDrainContainerJob($server))->everyTwoMinutes()->onOneServer()->before(function () {
+                    if (isCloud()) {
+                        $wait = rand(5, 20);
+                        Sleep::for($wait)->seconds();
+                    }
+                });
             }
         }
         foreach ($servers as $server) {
-            $schedule->job(new ServerStatusJob($server))->everyMinute()->onOneServer();
+            $schedule->job(new ServerStatusJob($server))->everyTwoMinutes()->onOneServer()->before(function () {
+                if (isCloud()) {
+                    $wait = rand(5, 20);
+                    Sleep::for($wait)->seconds();
+                }
+            });
         }
     }
     private function instance_auto_update($schedule)
@@ -138,7 +154,16 @@ private function check_scheduled_tasks($schedule)
                 $scheduled_task->delete();
                 continue;
             }
-
+            if ($application) {
+                if (str($application->status)->contains('running') === false) {
+                    continue;
+                }
+            }
+            if ($service) {
+                if (str($service->status())->contains('running') === false) {
+                    continue;
+                }
+            }
             if (isset(VALID_CRON_STRINGS[$scheduled_task->frequency])) {
                 $scheduled_task->frequency = VALID_CRON_STRINGS[$scheduled_task->frequency];
             }

diff --git a/app/Http/Controllers/Webhook/Bitbucket.php b/app/Http/Controllers/Webhook/Bitbucket.php
@@ -47,7 +47,7 @@ public function manual(Request $request)
             if ($x_bitbucket_event === 'repo:push') {
                 $branch = data_get($payload, 'push.changes.0.new.name');
                 $full_name = data_get($payload, 'repository.full_name');
-
+                $commit = data_get($payload, 'push.changes.0.new.target.hash');
                 if (!$branch) {
                     return response([
                         'status' => 'failed',
@@ -104,6 +104,7 @@ public function manual(Request $request)
                         queue_application_deployment(
                             application: $application,
                             deployment_uuid: $deployment_uuid,
+                            commit: $commit,
                             force_rebuild: false,
                             is_webhook: true
                         );

diff --git a/app/Http/Controllers/Webhook/Github.php b/app/Http/Controllers/Webhook/Github.php
@@ -129,6 +129,7 @@ public function manual(Request $request)
                                 application: $application,
                                 deployment_uuid: $deployment_uuid,
                                 force_rebuild: false,
+                                commit: data_get($payload, 'after', 'HEAD'),
                                 is_webhook: true,
                             );
                             $return_payloads->push([
@@ -177,6 +178,7 @@ public function manual(Request $request)
                                 pull_request_id: $pull_request_id,
                                 deployment_uuid: $deployment_uuid,
                                 force_rebuild: false,
+                                commit: data_get($payload, 'head.sha', 'HEAD'),
                                 is_webhook: true,
                                 git_type: 'github'
                             );
@@ -338,6 +340,7 @@ public function normal(Request $request)
                             queue_application_deployment(
                                 application: $application,
                                 deployment_uuid: $deployment_uuid,
+                                commit: data_get($payload, 'after', 'HEAD'),
                                 force_rebuild: false,
                                 is_webhook: true,
                             );
@@ -387,6 +390,7 @@ public function normal(Request $request)
                                 pull_request_id: $pull_request_id,
                                 deployment_uuid: $deployment_uuid,
                                 force_rebuild: false,
+                                commit: data_get($payload, 'head.sha', 'HEAD'),
                                 is_webhook: true,
                                 git_type: 'github'
                             );

diff --git a/app/Http/Controllers/Webhook/Gitlab.php b/app/Http/Controllers/Webhook/Gitlab.php
@@ -38,6 +38,15 @@ public function manual(Request $request)
             $headers = $request->headers->all();
             $x_gitlab_token = data_get($headers, 'x-gitlab-token.0');
             $x_gitlab_event = data_get($payload, 'object_kind');
+            $allowed_events = ['push', 'merge_request'];
+            if (!in_array($x_gitlab_event, $allowed_events)) {
+                $return_payloads->push([
+                    'status' => 'failed',
+                    'message' => 'Event not allowed. Only push and merge_request events are allowed.',
+                ]);
+                return response($return_payloads);
+            }
+
             if ($x_gitlab_event === 'push') {
                 $branch = data_get($payload, 'ref');
                 $full_name = data_get($payload, 'project.path_with_namespace');
@@ -124,6 +133,7 @@ public function manual(Request $request)
                             queue_application_deployment(
                                 application: $application,
                                 deployment_uuid: $deployment_uuid,
+                                commit: data_get($payload, 'after', 'HEAD'),
                                 force_rebuild: false,
                                 is_webhook: true,
                             );
@@ -173,6 +183,7 @@ public function manual(Request $request)
                                 application: $application,
                                 pull_request_id: $pull_request_id,
                                 deployment_uuid: $deployment_uuid,
+                                commit: data_get($payload, 'object_attributes.last_commit.id', 'HEAD'),
                                 force_rebuild: false,
                                 is_webhook: true,
                                 git_type: 'gitlab'