Merge pull request #3468 from coollabsio/next

v4.0.0-beta.340

.github/workflows/remove-labels-and-assignees-on-close.yml

@@ -0,0 +1,75 @@
+name: Remove Labels and Assignees on Issue Close
+
+on:
+  issues:
+    types: [closed]
+  pull_request:
+    types: [closed]
+  pull_request_target:
+    types: [closed]
+
+jobs:
+  remove-labels-and-assignees:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Remove labels and assignees
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const { owner, repo } = context.repo;
+            
+            async function processIssue(issueNumber) {
+              try {
+                const { data: currentLabels } = await github.rest.issues.listLabelsOnIssue({
+                  owner,
+                  repo,
+                  issue_number: issueNumber
+                });
+
+                const labelsToKeep = currentLabels
+                  .filter(label => label.name === '⏱︎ Stale')
+                  .map(label => label.name);
+
+                await github.rest.issues.setLabels({
+                  owner,
+                  repo,
+                  issue_number: issueNumber,
+                  labels: labelsToKeep
+                });
+
+                const { data: issue } = await github.rest.issues.get({
+                  owner,
+                  repo,
+                  issue_number: issueNumber
+                });
+
+                if (issue.assignees && issue.assignees.length > 0) {
+                  await github.rest.issues.removeAssignees({
+                    owner,
+                    repo,
+                    issue_number: issueNumber,
+                    assignees: issue.assignees.map(assignee => assignee.login)
+                  });
+                }
+              } catch (error) {
+                if (error.status !== 404) {
+                  console.error(`Error processing issue ${issueNumber}:`, error);
+                }
+              }
+            }
+
+            if (context.eventName === 'issues' || context.eventName === 'pull_request' || context.eventName === 'pull_request_target') {
+              const issue = context.payload.issue || context.payload.pull_request;
+              await processIssue(issue.number);
+            }
+
+            if (context.eventName === 'pull_request' || context.eventName === 'pull_request_target') {
+              const { data: closedIssues } = await github.rest.search.issuesAndPullRequests({
+                q: `repo:${owner}/${repo} is:issue is:closed linked:${context.payload.pull_request.number}`,
+                per_page: 100
+              });
+              for (const issue of closedIssues.items) {
+                await processIssue(issue.number);
+              }
+            }

app/Actions/Service/StartService.php

@@ -16,7 +16,7 @@ class StartService
         $service->saveComposeConfigs();
         $commands[] = 'cd '.$service->workdir();
         $commands[] = "echo 'Saved configuration files to {$service->workdir()}.'";
-        if($service->networks()->count() > 0){
+        if ($service->networks()->count() > 0) {
             $commands[] = "echo 'Creating Docker network.'";
             $commands[] = "docker network inspect $service->uuid >/dev/null 2>&1 || docker network create --attachable $service->uuid";
         }
@@ -31,7 +31,7 @@ class StartService
             $network = $service->destination->network;
             $serviceNames = data_get(Yaml::parse($compose), 'services', []);
             foreach ($serviceNames as $serviceName => $serviceConfig) {
-                $commands[] = "docker network connect --alias {$serviceName}-{$service->uuid} $network {$serviceName}-{$service->uuid} || true";
+                $commands[] = "docker network connect --alias {$serviceName}-{$service->uuid} $network {$serviceName}-{$service->uuid} >/dev/null 2>&1 || true";
             }
         }
         $activity = remote_process($commands, $service->server, type_uuid: $service->uuid, callEventOnFinish: 'ServiceStatusChanged');

app/Jobs/ApplicationDeploymentJob.php

@@ -514,7 +514,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
                 'hidden' => true,
                 'ignore_errors' => true,
             ], [
-                "docker network connect {$networkId} coolify-proxy || true",
+                "docker network connect {$networkId} coolify-proxy >/dev/null 2>&1 || true",
                 'hidden' => true,
                 'ignore_errors' => true,
             ]);

app/Jobs/PullHelperImageJob.php

@@ -42,8 +42,8 @@ class PullHelperImageJob implements ShouldBeEncrypted, ShouldQueue
                 $current_version = $settings->helper_version;
                 if (version_compare($latest_version, $current_version, '>')) {
                     // New version available
-                    $helperImage = config('coolify.helper_image');
-                    instant_remote_process(["docker pull -q {$helperImage}:{$latest_version}"], $this->server);
+                    // $helperImage = config('coolify.helper_image');
+                    // instant_remote_process(["docker pull -q {$helperImage}:{$latest_version}"], $this->server);
                     $settings->update(['helper_version' => $latest_version]);
                 }
             }

app/Livewire/Project/Service/Navbar.php

@@ -20,6 +20,8 @@ class Navbar extends Component
 
     public $isDeploymentProgress = false;
 
+    public $title = 'Configuration';
+
     public function mount()
     {
         if (str($this->service->status())->contains('running') && is_null($this->service->config_hash)) {

app/Livewire/Project/Shared/ExecuteContainerCommand.php

@@ -11,7 +11,7 @@ use Livewire\Component;
 
 class ExecuteContainerCommand extends Component
 {
-    public string $container;
+    public $container;
 
     public Collection $containers;
 
@@ -33,6 +33,9 @@ class ExecuteContainerCommand extends Component
 
     public function mount()
     {
+        if (! auth()->user()->isAdmin()) {
+            abort(403);
+        }
         $this->parameters = get_route_parameters();
         $this->containers = collect();
         $this->servers = collect();
@@ -57,24 +60,13 @@ class ExecuteContainerCommand extends Component
             if ($this->resource->destination->server->isFunctional()) {
                 $this->servers = $this->servers->push($this->resource->destination->server);
             }
-            $this->container = $this->resource->uuid;
-            $this->containers->push($this->container);
         } elseif (data_get($this->parameters, 'service_uuid')) {
             $this->type = 'service';
             $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
-            $this->resource->applications()->get()->each(function ($application) {
-                $this->containers->push(data_get($application, 'name').'-'.data_get($this->resource, 'uuid'));
-            });
-            $this->resource->databases()->get()->each(function ($database) {
-                $this->containers->push(data_get($database, 'name').'-'.data_get($this->resource, 'uuid'));
-            });
             if ($this->resource->server->isFunctional()) {
                 $this->servers = $this->servers->push($this->resource->server);
             }
         }
-        if ($this->containers->count() > 0) {
-            $this->container = $this->containers->first();
-        }
     }
 
     public function loadContainers()
@@ -97,19 +89,42 @@ class ExecuteContainerCommand extends Component
                     ];
                     $this->containers = $this->containers->push($payload);
                 }
+            } elseif (data_get($this->parameters, 'database_uuid')) {
+                if ($this->resource->isRunning()) {
+                    $this->containers = $this->containers->push([
+                        'server' => $server,
+                        'container' => [
+                            'Names' => $this->resource->uuid,
+                        ],
+                    ]);
+                }
+            } elseif (data_get($this->parameters, 'service_uuid')) {
+                $this->resource->applications()->get()->each(function ($application) {
+                    ray($application);
+                    if ($application->isRunning()) {
+                        $this->containers->push([
+                            'server' => $this->resource->server,
+                            'container' => [
+                                'Names' => data_get($application, 'name').'-'.data_get($this->resource, 'uuid'),
+                            ],
+                        ]);
+                    }
+                });
+                $this->resource->databases()->get()->each(function ($database) {
+                    if ($database->isRunning()) {
+                        $this->containers->push([
+                            'server' => $this->resource->server,
+                            'container' => [
+                                'Names' => data_get($database, 'name').'-'.data_get($this->resource, 'uuid'),
+                            ],
+                        ]);
+                    }
+                });
             }
+
         }
         if ($this->containers->count() > 0) {
-            if (data_get($this->parameters, 'application_uuid')) {
-                $this->container = data_get($this->containers->first(), 'container.Names');
-            } elseif (data_get($this->parameters, 'database_uuid')) {
-                $this->container = $this->containers->first();
-            } elseif (data_get($this->parameters, 'service_uuid')) {
-                $this->container = $this->containers->first();
-            }
-            if ($this->containers->count() === 1) {
-                $this->dispatch('connectToContainer');
-            }
+            $this->container = $this->containers->first();
         }
     }
 
@@ -117,17 +132,12 @@ class ExecuteContainerCommand extends Component
     public function connectToContainer()
     {
         try {
-            if (data_get($this->parameters, 'application_uuid')) {
-                $container = $this->containers->where('container.Names', $this->container)->first();
-                $container_name = data_get($container, 'container.Names');
-                if (is_null($container)) {
-                    throw new \RuntimeException('Container not found.');
-                }
-                $server = data_get($container, 'server');
-            } else {
-                $container_name = $this->container;
-                $server = $this->servers->first();
+            $container_name = data_get($this->container, 'container.Names');
+            if (is_null($container_name)) {
+                throw new \RuntimeException('Container not found.');
             }
+            $server = data_get($this->container, 'server');
+
             if ($server->isForceDisabled()) {
                 throw new \RuntimeException('Server is disabled.');
             }

app/Livewire/Project/Shared/Terminal.php

@@ -14,17 +14,10 @@ class Terminal extends Component
 
         $server = Server::ownedByCurrentTeam()->whereUuid($serverUuid)->firstOrFail();
 
-        // if (auth()->user()) {
-        //     $teams = auth()->user()->teams->pluck('id');
-        //     if (! $teams->contains($server->team_id) && ! $teams->contains(0)) {
-        //         throw new \Exception('User is not part of the team that owns this server');
-        //     }
-        // }
-
         if ($isContainer) {
             $status = getContainerStatus($server, $identifier);
             if ($status !== 'running') {
-                return handleError(new \Exception('Container is not running'), $this);
+                return;
             }
             $command = generateSshCommand($server, "docker exec -it {$identifier} sh -c 'if [ -f ~/.profile ]; then . ~/.profile; fi; if [ -n \"\$SHELL\" ]; then exec \$SHELL; else sh; fi'");
         } else {

app/Livewire/RunCommand.php

@@ -1,101 +0,0 @@
-<?php
-
-namespace App\Livewire;
-
-use Livewire\Attributes\On;
-use Livewire\Component;
-
-class RunCommand extends Component
-{
-    public $selected_uuid = 'default';
-
-    public $servers = [];
-
-    public $containers = [];
-
-    public function mount($servers)
-    {
-        $this->servers = $servers;
-        $this->containers = $this->getAllActiveContainers();
-    }
-
-    private function getAllActiveContainers()
-    {
-        return collect($this->servers)->flatMap(function ($server) {
-            if (! $server->isFunctional()) {
-                return [];
-            }
-
-            return $server->definedResources()
-                ->filter(function ($resource) {
-                    $status = method_exists($resource, 'realStatus') ? $resource->realStatus() : (method_exists($resource, 'status') ? $resource->status() : 'exited');
-
-                    return str_starts_with($status, 'running:');
-                })
-                ->map(function ($resource) use ($server) {
-                    if (isDev()) {
-                        if (data_get($resource, 'name') === 'coolify-db') {
-                            $container_name = 'coolify-db';
-
-                            return [
-                                'name' => $resource->name,
-                                'connection_name' => $container_name,
-                                'uuid' => $resource->uuid,
-                                'status' => 'running',
-                                'server' => $server,
-                                'server_uuid' => $server->uuid,
-                            ];
-                        }
-                    }
-
-                    if (class_basename($resource) === 'Application') {
-                        if (! $server->isSwarm()) {
-                            $current_containers = getCurrentApplicationContainerStatus($server, $resource->id, includePullrequests: true);
-                        }
-                        $status = $resource->status;
-                    } elseif (class_basename($resource) === 'Service') {
-                        $current_containers = getCurrentServiceContainerStatus($server, $resource->id);
-                        $status = $resource->status();
-                    } else {
-                        $status = getContainerStatus($server, $resource->uuid);
-                        if ($status === 'running') {
-                            $current_containers = collect([
-                                'Names' => $resource->name,
-                            ]);
-                        }
-                    }
-                    if ($server->isSwarm()) {
-                        $container_name = $resource->uuid.'_'.$resource->uuid;
-                    } else {
-                        $container_name = data_get($current_containers->first(), 'Names');
-                    }
-
-                    return [
-                        'name' => $resource->name,
-                        'connection_name' => $container_name,
-                        'uuid' => $resource->uuid,
-                        'status' => $status,
-                        'server' => $server,
-                        'server_uuid' => $server->uuid,
-                    ];
-                });
-        });
-    }
-
-    public function updatedSelectedUuid($value)
-    {
-        $this->connectToContainer();
-    }
-
-    #[On('connectToContainer')]
-    public function connectToContainer()
-    {
-        $container = collect($this->containers)->firstWhere('uuid', $this->selected_uuid);
-
-        $this->dispatch('send-terminal-command',
-            isset($container),
-            $container['connection_name'] ?? $this->selected_uuid,
-            $container['server_uuid'] ?? $this->selected_uuid
-        );
-    }
-}

app/Livewire/Terminal/Index.php

@@ -3,15 +3,70 @@
 namespace App\Livewire\Terminal;
 
 use App\Models\Server;
+use Livewire\Attributes\On;
 use Livewire\Component;
 
 class Index extends Component
 {
+    public $selected_uuid = 'default';
+
     public $servers = [];
 
+    public $containers = [];
+
     public function mount()
     {
+        if (! auth()->user()->isAdmin()) {
+            abort(403);
+        }
         $this->servers = Server::isReachable()->get();
+        $this->containers = $this->getAllActiveContainers();
+    }
+
+    private function getAllActiveContainers()
+    {
+        return collect($this->servers)->flatMap(function ($server) {
+            if (! $server->isFunctional()) {
+                return [];
+            }
+
+            return $server->loadAllContainers()->map(function ($container) use ($server) {
+                $state = data_get_str($container, 'State')->lower();
+                if ($state->contains('running')) {
+                    return [
+                        'name' => data_get($container, 'Names'),
+                        'connection_name' => data_get($container, 'Names'),
+                        'uuid' => data_get($container, 'Names'),
+                        'status' => data_get_str($container, 'State')->lower(),
+                        'server' => $server,
+                        'server_uuid' => $server->uuid,
+                    ];
+                }
+
+                return null;
+            })->filter();
+        });
+    }
+
+    public function updatedSelectedUuid()
+    {
+        $this->connectToContainer();
+    }
+
+    #[On('connectToContainer')]
+    public function connectToContainer()
+    {
+        if ($this->selected_uuid === 'default') {
+            $this->dispatch('error', 'Please select a server or a container.');
+
+            return;
+        }
+        $container = collect($this->containers)->firstWhere('uuid', $this->selected_uuid);
+        $this->dispatch('send-terminal-command',
+            isset($container),
+            $container['connection_name'] ?? $this->selected_uuid,
+            $container['server_uuid'] ?? $this->selected_uuid
+        );
     }
 
     public function render()

app/Models/Server.php

@@ -775,6 +775,18 @@ $schema://$host {
         }
     }
 
+    public function loadAllContainers(): Collection
+    {
+        if ($this->isFunctional()) {
+            $containers = instant_remote_process(["docker ps -a --format '{{json .}}'"], $this);
+            $containers = format_docker_command_output_to_json($containers);
+
+            return collect($containers);
+        }
+
+        return collect([]);
+    }
+
     public function loadUnmanagedContainers(): Collection
     {
         if ($this->isFunctional()) {

app/Models/ServiceApplication.php

@@ -32,6 +32,16 @@ class ServiceApplication extends BaseModel
         return ServiceApplication::whereRelation('service.environment.project.team', 'id', $teamId)->orderBy('name');
     }
 
+    public function isRunning()
+    {
+        return str($this->status)->contains('running');
+    }
+
+    public function isExited()
+    {
+        return str($this->status)->contains('exited');
+    }
+
     public function isLogDrainEnabled()
     {
         return data_get($this, 'is_log_drain_enabled', false);

app/Models/ServiceDatabase.php

@@ -25,6 +25,16 @@ class ServiceDatabase extends BaseModel
         remote_process(["docker restart {$container_id}"], $this->service->server);
     }
 
+    public function isRunning()
+    {
+        return str($this->status)->contains('running');
+    }
+
+    public function isExited()
+    {
+        return str($this->status)->contains('exited');
+    }
+
     public function isLogDrainEnabled()
     {
         return data_get($this, 'is_log_drain_enabled', false);

app/Models/StandaloneClickhouse.php

@@ -75,6 +75,11 @@ class StandaloneClickhouse extends BaseModel
         }
     }
 
+    public function isRunning()
+    {
+        return (bool) str($this->status)->contains('running');
+    }
+
     public function isExited()
     {
         return (bool) str($this->status)->startsWith('exited');

app/Models/StandaloneDragonfly.php

@@ -75,6 +75,11 @@ class StandaloneDragonfly extends BaseModel
         }
     }
 
+    public function isRunning()
+    {
+        return (bool) str($this->status)->contains('running');
+    }
+
     public function isExited()
     {
         return (bool) str($this->status)->startsWith('exited');

app/Models/StandaloneKeydb.php

@@ -75,6 +75,11 @@ class StandaloneKeydb extends BaseModel
         }
     }
 
+    public function isRunning()
+    {
+        return (bool) str($this->status)->contains('running');
+    }
+
     public function isExited()
     {
         return (bool) str($this->status)->startsWith('exited');

app/Models/StandaloneMariadb.php

@@ -75,6 +75,11 @@ class StandaloneMariadb extends BaseModel
         }
     }
 
+    public function isRunning()
+    {
+        return (bool) str($this->status)->contains('running');
+    }
+
     public function isExited()
     {
         return (bool) str($this->status)->startsWith('exited');

app/Models/StandaloneMongodb.php

@@ -79,6 +79,11 @@ class StandaloneMongodb extends BaseModel
         }
     }
 
+    public function isRunning()
+    {
+        return (bool) str($this->status)->contains('running');
+    }
+
     public function isExited()
     {
         return (bool) str($this->status)->startsWith('exited');

app/Models/StandaloneMysql.php

@@ -76,6 +76,11 @@ class StandaloneMysql extends BaseModel
         }
     }
 
+    public function isRunning()
+    {
+        return (bool) str($this->status)->contains('running');
+    }
+
     public function isExited()
     {
         return (bool) str($this->status)->startsWith('exited');

app/Models/StandalonePostgresql.php

@@ -102,6 +102,11 @@ class StandalonePostgresql extends BaseModel
         }
     }
 
+    public function isRunning()
+    {
+        return (bool) str($this->status)->contains('running');
+    }
+
     public function isExited()
     {
         return (bool) str($this->status)->startsWith('exited');

app/Models/StandaloneRedis.php

@@ -71,6 +71,11 @@ class StandaloneRedis extends BaseModel
         }
     }
 
+    public function isRunning()
+    {
+        return (bool) str($this->status)->contains('running');
+    }
+
     public function isExited()
     {
         return (bool) str($this->status)->startsWith('exited');

bootstrap/helpers/docker.php

@@ -229,12 +229,12 @@ function generateServiceSpecificFqdns(ServiceApplication|Application $resource)
             }
             if (is_null($MINIO_BROWSER_REDIRECT_URL?->value)) {
                 $MINIO_BROWSER_REDIRECT_URL?->update([
-                    'value' => generateFqdn($server, 'console-'.$uuid),
+                    'value' => generateFqdn($server, 'console-'.$uuid, true),
                 ]);
             }
             if (is_null($MINIO_SERVER_URL?->value)) {
                 $MINIO_SERVER_URL?->update([
-                    'value' => generateFqdn($server, 'minio-'.$uuid),
+                    'value' => generateFqdn($server, 'minio-'.$uuid, true),
                 ]);
             }
             $payload = collect([

bootstrap/helpers/shared.php

@@ -478,7 +478,7 @@ function data_get_str($data, $key, $default = null): Stringable
     return str($str);
 }
 
-function generateFqdn(Server $server, string $random): string
+function generateFqdn(Server $server, string $random, bool $forceHttps = false): string
 {
     $wildcard = data_get($server, 'settings.wildcard_domain');
     if (is_null($wildcard) || $wildcard === '') {
@@ -488,6 +488,9 @@ function generateFqdn(Server $server, string $random): string
     $host = $url->getHost();
     $path = $url->getPath() === '/' ? '' : $url->getPath();
     $scheme = $url->getScheme();
+    if ($forceHttps) {
+        $scheme = 'https';
+    }
     $finalFqdn = "$scheme://{$random}.$host$path";
 
     return $finalFqdn;

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

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.336';
+return '4.0.0-beta.340';

docker-compose.prod.yml

@@ -110,7 +110,7 @@ services:
       retries: 10
       timeout: 2s
   soketi:
-    image: 'ghcr.io/coollabsio/coolify-realtime:1.0.0'
+    image: 'ghcr.io/coollabsio/coolify-realtime:1.0.1'
     ports:
       - "${SOKETI_PORT:-6001}:6001"
       - "6002:6002"
@@ -123,7 +123,7 @@ services:
       SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY}"
       SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET}"
     healthcheck:
-      test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:6001/ready && wget -qO- http://127.0.0.1:6002/ready || exit 1"]
+      test: [ "CMD-SHELL", "wget -qO- http://127.0.0.1:6001/ready && wget -qO- http://127.0.0.1:6002/ready || exit 1" ]
       interval: 5s
       retries: 10
       timeout: 2s

docker/coolify-realtime/terminal-server.js

@@ -123,7 +123,6 @@ async function handleCommand(ws, command, userId) {
         cols: 80,
         rows: 30,
         cwd: process.env.HOME,
-        env: process.env
     };
 
     // NOTE: - Initiates a process within the Terminal container

other/nightly/docker-compose.prod.yml

@@ -110,7 +110,7 @@ services:
       retries: 10
       timeout: 2s
   soketi:
-    image: 'ghcr.io/coollabsio/coolify-realtime:1.0.0'
+    image: 'ghcr.io/coollabsio/coolify-realtime:1.0.1'
     ports:
       - "${SOKETI_PORT:-6001}:6001"
       - "6002:6002"
@@ -123,7 +123,7 @@ services:
       SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY}"
       SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET}"
     healthcheck:
-      test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:6001/ready && wget -qO- http://127.0.0.1:6002/ready || exit 1"]
+      test: [ "CMD-SHELL", "wget -qO- http://127.0.0.1:6001/ready && wget -qO- http://127.0.0.1:6002/ready || exit 1" ]
       interval: 5s
       retries: 10
       timeout: 2s

other/nightly/install.sh

@@ -5,6 +5,7 @@ set -e # Exit immediately if a command exits with a non-zero status
 ## $1 could be empty, so we need to disable this check
 #set -u # Treat unset variables as an error and exit
 set -o pipefail # Cause a pipeline to return the status of the last command that exited with a non-zero status
+CDN="https://cdn.coollabs.io/coolify-nightly"
 DATE=$(date +"%Y%m%d-%H%M%S")
 
 VERSION="1.5"
@@ -21,7 +22,13 @@ INSTALLATION_LOG_WITH_DATE="/data/coolify/source/installation-${DATE}.log"
 
 exec > >(tee -a $INSTALLATION_LOG_WITH_DATE) 2>&1
 
-CDN="https://cdn.coollabs.io/coolify-nightly"
+getAJoke() {
+    JOKES=$(curl -s --max-time 2 https://v2.jokeapi.dev/joke/Programming?format=txt&type=single&amount=1 || true)
+    if [ "$JOKES" != "" ]; then
+        echo -e " - Until then, here's a joke for you:\n"
+        echo -e "$JOKES\n"
+    fi
+}
 OS_TYPE=$(grep -w "ID" /etc/os-release | cut -d "=" -f 2 | tr -d '"')
 ENV_FILE="/data/coolify/source/.env"
 
@@ -202,6 +209,7 @@ fi
 echo -e "3. Check Docker Installation. "
 if ! [ -x "$(command -v docker)" ]; then
     echo " - Docker is not installed. Installing Docker. It may take a while."
+    getAJoke
     case "$OS_TYPE" in
         "almalinux")
             dnf config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo >/dev/null 2>&1
@@ -477,22 +485,14 @@ chmod -R 700 /data/coolify
 echo -e "9. Installing Coolify ($LATEST_VERSION)"
 echo -e " - It could take a while based on your server's performance, network speed, stars, etc."
 echo -e " - Please wait."
-JOKES=$(curl -s https://v2.jokeapi.dev/joke/Programming?format=txt&type=single&amount=1 || true)
-if [ "$JOKES" != "" ]; then
-    echo -e " - Until then, here's a joke for you:\n"
-    echo -e "$JOKES\n"
-fi
+getAJoke
 
 bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}" >/dev/null 2>&1
 echo " - Coolify installed successfully."
 rm -f $ENV_FILE-$DATE
 
 echo " - Waiting for 20 seconds for Coolify (database migrations) to be ready."
-JOKES=$(curl -s https://v2.jokeapi.dev/joke/Programming?format=txt&type=single&amount=1 || true)
-if [ "$JOKES" != "" ]; then
-    echo -e " - Until then, here's a joke for you:\n"
-    echo -e "$JOKES\n"
-fi
+getAJoke
 
 sleep 20
 echo -e "\033[0;35m
@@ -505,5 +505,5 @@ echo -e "\033[0;35m
 \033[0m"
 echo -e "\nYour instance is ready to use."
 echo -e "Please visit http://$(curl -4s https://ifconfig.io):8000 to get started.\n"
-echo -e "WARNING: We recommend you backup your /data/coolify/source/.env file to a safe location, outside of this server."
+echo -e "WARNING: We recommend you to backup your /data/coolify/source/.env file to a safe location, outside of this server."
 cp /data/coolify/source/.env /data/coolify/source/.env.backup

other/nightly/versions.json

@@ -1,16 +1,16 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.336"
+            "version": "4.0.0-beta.339"
         },
         "nightly": {
-            "version": "4.0.0-beta.337"
+            "version": "4.0.0-beta.340"
         },
         "helper": {
             "version": "1.0.1"
         },
         "realtime": {
-            "version": "1.0.0"
+            "version": "1.0.1"
         }
     }
 }

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

@@ -3,8 +3,8 @@
         {{ data_get_str($service, 'name')->limit(10) }} > Configuration | Coolify
     </x-slot>
     <livewire:project.service.navbar :service="$service" :parameters="$parameters" :query="$query" />
-    <div class="flex flex-col h-full gap-8 pt-6 sm:flex-row">
-        <div class="flex flex-col items-start gap-2 min-w-fit">
+    <div class="flex flex-col gap-8 pt-6 h-full sm:flex-row">
+        <div class="flex flex-col gap-2 items-start min-w-fit">
             <a class="menu-item sm:min-w-fit" target="_blank" href="{{ $service->documentation() }}">Documentation
                 <x-external-link /></a>
             <a class="menu-item sm:min-w-fit" :class="activeTab === 'service-stack' && 'menu-item-active'"
@@ -23,10 +23,6 @@
                 @click.prevent="activeTab = 'scheduled-tasks'; window.location.hash = 'scheduled-tasks'"
                 href="#">Scheduled Tasks
             </a>
-            <a class="menu-item sm:min-w-fit" :class="activeTab === 'execute-command' && 'menu-item-active'"
-                @click.prevent="activeTab = 'execute-command';
-                window.location.hash = 'execute-command'"
-                href="#">Execute Command</a>
             <a class="menu-item sm:min-w-fit" :class="activeTab === 'logs' && 'menu-item-active'"
                 @click.prevent="activeTab = 'logs';
                 window.location.hash = 'logs'"
@@ -168,7 +164,7 @@
                 </div>
             </div>
             <div x-cloak x-show="activeTab === 'storages'">
-                <div class="flex items-center gap-2">
+                <div class="flex gap-2 items-center">
                     <h2>Storages</h2>
                 </div>
                 <div class="pb-4">Persistent storage to preserve data between deployments.</div>
@@ -191,9 +187,6 @@
             <div x-cloak x-show="activeTab === 'logs'">
                 <livewire:project.shared.logs :resource="$service" />
             </div>
-            <div x-cloak x-show="activeTab === 'execute-command'">
-                <livewire:project.shared.execute-container-command :resource="$service" />
-            </div>
             <div x-cloak x-show="activeTab === 'environment-variables'">
                 <livewire:project.shared.environment-variable.all :resource="$service" />
             </div>

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

@@ -6,17 +6,21 @@
             <livewire:activity-monitor header="Logs" showWaiting fullHeight />
         </x-slot:content>
     </x-slide-over>
-    <h1>Configuration</h1>
+    <h1>{{ $title }}</h1>
     <x-resources.breadcrumbs :resource="$service" :parameters="$parameters" />
     <div class="navbar-main" x-data>
-        <nav class="flex items-center flex-shrink-0 gap-6 scrollbar min-h-10 whitespace-nowrap">
+        <nav class="flex flex-shrink-0 gap-6 items-center whitespace-nowrap scrollbar min-h-10">
             <a class="{{ request()->routeIs('project.service.configuration') ? 'dark:text-white' : '' }}"
                 href="{{ route('project.service.configuration', $parameters) }}">
                 <button>Configuration</button>
             </a>
+            <a class="{{ request()->routeIs('project.service.command') ? 'dark:text-white' : '' }}"
+                href="{{ route('project.service.command', $parameters) }}">
+                <button>Terminal</button>
+            </a>
             <x-services.links :service="$service" />
         </nav>
-        <div class="flex flex-wrap items-center order-first gap-2 sm:order-last">
+        <div class="flex flex-wrap order-first gap-2 items-center sm:order-last">
             @if (str($service->status())->contains('running'))
                 <button @click="$wire.dispatch('restartEvent')" class="gap-2 button">
                     <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
@@ -71,7 +75,7 @@
                 </x-modal-confirmation>
             @elseif (str($service->status())->contains('exited'))
                 <button wire:click='stop(true)' class="gap-2 button">
-                    <svg class="w-5 h-5 " viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+                    <svg class="w-5 h-5" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
                         <path fill="red" d="M26 20h-6v-2h6zm4 8h-6v-2h6zm-2-4h-6v-2h6z" />
                         <path fill="red"
                             d="M17.003 20a4.895 4.895 0 0 0-2.404-4.173L22 3l-1.73-1l-7.577 13.126a5.699 5.699 0 0 0-5.243 1.503C3.706 20.24 3.996 28.682 4.01 29.04a1 1 0 0 0 1 .96h14.991a1 1 0 0 0 .6-1.8c-3.54-2.656-3.598-8.146-3.598-8.2Zm-5.073-3.003A3.11 3.11 0 0 1 15.004 20c0 .038.002.208.017.469l-5.9-2.624a3.8 3.8 0 0 1 2.809-.848ZM15.45 28A5.2 5.2 0 0 1 14 25h-2a6.5 6.5 0 0 0 .968 3h-2.223A16.617 16.617 0 0 1 10 24H8a17.342 17.342 0 0 0 .665 4H6c.031-1.836.29-5.892 1.803-8.553l7.533 3.35A13.025 13.025 0 0 0 17.596 28Z" />

resources/views/livewire/project/shared/execute-container-command.blade.php

@@ -10,11 +10,11 @@
         <h1>Terminal</h1>
         <livewire:project.database.heading :database="$resource" />
     @elseif ($type === 'service')
-        <h2>Terminal</h2>
+        <livewire:project.service.navbar :service="$resource" :parameters="$parameters" title="Terminal" />
     @endif
     <div x-init="$wire.loadContainers">
         <div class="pt-4" wire:loading wire:target='loadContainers'>
-            Loading containers...
+            Loading resources...
         </div>
         <div wire:loading.remove wire:target='loadContainers'>
             @if (count($containers) > 0)
@@ -22,24 +22,12 @@
                     wire:submit="$dispatchSelf('connectToContainer')">
                     <x-forms.select label="Container" id="container" required>
                         <option disabled selected>Select container</option>
-                        @if (data_get($this->parameters, 'application_uuid'))
-                            @foreach ($containers as $container)
-                                <option value="{{ data_get($container, 'container.Names') }}">
-                                    {{ data_get($container, 'container.Names') }}
-                                    ({{ data_get($container, 'server.name') }})
-                                </option>
-                            @endforeach
-                        @elseif(data_get($this->parameters, 'service_uuid'))
-                            @foreach ($containers as $container)
-                                <option value="{{ $container }}">
-                                    {{ $container }} ({{ data_get($servers, '0.name') }})
-                                </option>
-                            @endforeach
-                        @else
-                            <option value="{{ $container }}">
-                                {{ $container }} ({{ data_get($servers, '0.name') }})
+                        @foreach ($containers as $container)
+                            <option value="{{ data_get($container, 'container.Names') }}">
+                                {{ data_get($container, 'container.Names') }}
+                                ({{ data_get($container, 'server.name') }})
                             </option>
-                        @endif
+                        @endforeach
                     </x-forms.select>
                     <x-forms.button type="submit">Connect</x-forms.button>
                 </form>

resources/views/livewire/project/shared/terminal.blade.php

@@ -67,6 +67,10 @@
                     socket.onerror = (e) => {
                         console.error('WebSocket error:', e);
                     };
+                    socket.onclose = () => {
+                        console.log('WebSocket connection closed');
+
+                    };
                 }
             }
 
@@ -112,9 +116,8 @@
                 socket.send(JSON.stringify({
                     message: data
                 }));
-
                 // Type CTRL + D or exit in the terminal
-                if (data === '\x04' || (data === '\r' && stripAnsiCommands(commandBuffer).trim() === 'exit')) {
+                if (data === '\x04' || (data === '\r' && stripAnsiCommands(commandBuffer).trim().includes('exit'))) {
                     checkIfProcessIsRunningAndKillIt();
                     setTimeout(() => {
                         $data.terminalActive = false;

resources/views/livewire/run-command.blade.php

@@ -1,22 +0,0 @@
-<div>
-    <form class="flex flex-col gap-2 justify-center xl:items-end xl:flex-row"
-        wire:submit="$dispatchSelf('connectToContainer')">
-        <x-forms.select id="server" required wire:model.live="selected_uuid">
-            @foreach ($servers as $server)
-                @if ($loop->first)
-                    <option disabled value="default">Select a server or container</option>
-                @endif
-                <option value="{{ $server->uuid }}">{{ $server->name }}</option>
-                @foreach ($containers as $container)
-                    @if ($container['server_uuid'] == $server->uuid)
-                        <option value="{{ $container['uuid'] }}">
-                            {{ $server->name }} -> {{ $container['name'] }}
-                        </option>
-                    @endif
-                @endforeach
-            @endforeach
-        </x-forms.select>
-        <x-forms.button type="submit">Connect</x-forms.button>
-    </form>
-    <livewire:project.shared.terminal />
-</div>

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

@@ -8,11 +8,27 @@
         <x-helper
             helper="If you're having trouble connecting to your server, make sure that the port is open.<br><br><a class='underline' href='https://coolify.io/docs/knowledge-base/server/firewall/#terminal' target='_blank'>Documentation</a>"></x-helper>
     </div>
-    @if ($servers->count() > 0)
-        <livewire:run-command :servers="$servers" />
-    @else
-        <div>
-            <div>No servers found. Without a server, you won't be able to do much.</div>
-        </div>
-    @endif
+    <div>
+        <form class="flex flex-col gap-2 justify-center xl:items-end xl:flex-row"
+            wire:submit="$dispatchSelf('connectToContainer')">
+            <x-forms.select id="server" required wire:model.live="selected_uuid">
+                @foreach ($servers as $server)
+                    @if ($loop->first)
+                        <option disabled value="default">Select a server or container</option>
+                    @endif
+                    <option value="{{ $server->uuid }}">{{ $server->name }}</option>
+                    @foreach ($containers as $container)
+                        @if ($container['server_uuid'] == $server->uuid)
+                            <option value="{{ $container['uuid'] }}">
+                                {{ $server->name }} -> {{ $container['name'] }}
+                            </option>
+                        @endif
+                    @endforeach
+                @endforeach
+            </x-forms.select>
+            <x-forms.button type="submit">Connect</x-forms.button>
+        </form>
+        <livewire:project.shared.terminal />
+    </div>
+
 </div>

routes/web.php

@@ -195,8 +195,8 @@ Route::middleware(['auth', 'verified'])->group(function () {
     });
     Route::prefix('project/{project_uuid}/{environment_name}/service/{service_uuid}')->group(function () {
         Route::get('/', ServiceConfiguration::class)->name('project.service.configuration');
-        Route::get('/{stack_service_uuid}', ServiceIndex::class)->name('project.service.index');
         Route::get('/terminal', ExecuteContainerCommand::class)->name('project.service.command');
+        Route::get('/{stack_service_uuid}', ServiceIndex::class)->name('project.service.index');
         Route::get('/tasks/{task_uuid}', ScheduledTaskShow::class)->name('project.service.scheduled-tasks');
     });
 

scripts/install.sh

@@ -5,6 +5,7 @@ set -e # Exit immediately if a command exits with a non-zero status
 ## $1 could be empty, so we need to disable this check
 #set -u # Treat unset variables as an error and exit
 set -o pipefail # Cause a pipeline to return the status of the last command that exited with a non-zero status
+CDN="https://cdn.coollabs.io/coolify"
 DATE=$(date +"%Y%m%d-%H%M%S")
 
 VERSION="1.5"
@@ -21,7 +22,13 @@ INSTALLATION_LOG_WITH_DATE="/data/coolify/source/installation-${DATE}.log"
 
 exec > >(tee -a $INSTALLATION_LOG_WITH_DATE) 2>&1
 
-CDN="https://cdn.coollabs.io/coolify-nightly"
+getAJoke() {
+    JOKES=$(curl -s --max-time 2 https://v2.jokeapi.dev/joke/Programming?format=txt&type=single&amount=1 || true)
+    if [ "$JOKES" != "" ]; then
+        echo -e " - Until then, here's a joke for you:\n"
+        echo -e "$JOKES\n"
+    fi
+}
 OS_TYPE=$(grep -w "ID" /etc/os-release | cut -d "=" -f 2 | tr -d '"')
 ENV_FILE="/data/coolify/source/.env"
 
@@ -202,6 +209,7 @@ fi
 echo -e "3. Check Docker Installation. "
 if ! [ -x "$(command -v docker)" ]; then
     echo " - Docker is not installed. Installing Docker. It may take a while."
+    getAJoke
     case "$OS_TYPE" in
         "almalinux")
             dnf config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo >/dev/null 2>&1
@@ -477,22 +485,14 @@ chmod -R 700 /data/coolify
 echo -e "9. Installing Coolify ($LATEST_VERSION)"
 echo -e " - It could take a while based on your server's performance, network speed, stars, etc."
 echo -e " - Please wait."
-JOKES=$(curl -s https://v2.jokeapi.dev/joke/Programming?format=txt&type=single&amount=1 || true)
-if [ "$JOKES" != "" ]; then
-    echo -e " - Until then, here's a joke for you:\n"
-    echo -e "$JOKES\n"
-fi
+getAJoke
 
 bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}" >/dev/null 2>&1
 echo " - Coolify installed successfully."
 rm -f $ENV_FILE-$DATE
 
 echo " - Waiting for 20 seconds for Coolify (database migrations) to be ready."
-JOKES=$(curl -s https://v2.jokeapi.dev/joke/Programming?format=txt&type=single&amount=1 || true)
-if [ "$JOKES" != "" ]; then
-    echo -e " - Until then, here's a joke for you:\n"
-    echo -e "$JOKES\n"
-fi
+getAJoke
 
 sleep 20
 echo -e "\033[0;35m
@@ -505,5 +505,5 @@ echo -e "\033[0;35m
 \033[0m"
 echo -e "\nYour instance is ready to use."
 echo -e "Please visit http://$(curl -4s https://ifconfig.io):8000 to get started.\n"
-echo -e "WARNING: We recommend you backup your /data/coolify/source/.env file to a safe location, outside of this server."
+echo -e "WARNING: We recommend you to backup your /data/coolify/source/.env file to a safe location, outside of this server."
 cp /data/coolify/source/.env /data/coolify/source/.env.backup

versions.json

@@ -1,16 +1,16 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.336"
+            "version": "4.0.0-beta.340"
         },
         "nightly": {
-            "version": "4.0.0-beta.337"
+            "version": "4.0.0-beta.341"
         },
         "helper": {
             "version": "1.0.1"
         },
         "realtime": {
-            "version": "1.0.0"
+            "version": "1.0.1"
         }
     }
 }