Merge branch 'next' into fix-ssh-multiplexing-docker-desktop-windows

2024-09-12 12:14:24 +02:00
parent 4aeb8ff02b 75f266fa9f
commit a95ebb4d56
15 changed files with 209 additions and 346 deletions
--- a/.env.development.example
+++ b/.env.development.example
@@ -6,7 +6,7 @@ APP_KEY=
 APP_URL=http://localhost
 APP_PORT=8000
 APP_DEBUG=true
-MUX_ENABLED=false
+SSH_MUX_ENABLED=false

 # PostgreSQL Database Configuration
 DB_DATABASE=coolify
--- a/app/Livewire/Boarding/Index.php
+++ b/app/Livewire/Boarding/Index.php
@@ -282,7 +282,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
    public function validateServer()
    {
        try {
-            config()->set('coolify.mux_enabled', false);
+            config()->set('constants.ssh.mux_enabled', false);

            // EC2 does not have `uptime` command, lol
            instant_remote_process(['ls /'], $this->createdServer, true);
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -967,7 +967,7 @@ $schema://$host {

    public function validateConnection()
    {
-        config()->set('coolify.mux_enabled', false);
+        config()->set('constants.ssh.mux_enabled', false);

        $server = Server::find($this->id);
        if (! $server) {
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -667,7 +667,7 @@ class Service extends BaseModel
                    }
                    $data = $data->merge([
                        'Root User' => [
-                            'key' => 'N/A',
+                            'key' => 'GITLAB_ROOT_USER',
                            'value' => 'root',
                            'rules' => 'required',
                            'isPassword' => true,
--- a/bootstrap/helpers/proxy.php
+++ b/bootstrap/helpers/proxy.php
@@ -137,6 +137,8 @@ function generate_default_proxy_configuration(Server $server)
            'external' => true,
        ];
    });
+    // TODO: This should not be null on new servers, but it is.
+    ray($proxy_type);
    if ($proxy_type === ProxyTypes::TRAEFIK->value) {
        $labels = [
            'traefik.enable=true',
--- a/bootstrap/helpers/remoteProcess.php
+++ b/bootstrap/helpers/remoteProcess.php
@@ -161,8 +161,8 @@ function generateSshCommand(Server $server, string $command)

    $ssh_command = "timeout $timeout ssh ";

-    $muxEnabled = config('coolify.mux_enabled') && config('coolify.is_windows_docker_desktop') == false;
-
+    $muxEnabled = config('constants.ssh.mux_enabled') && config('coolify.is_windows_docker_desktop') == false;
+    // ray('SSH Multiplexing Enabled:', $muxEnabled)->blue();
    if ($muxEnabled) {
        // Always use multiplexing when enabled
        $muxSocket = "/var/www/html/storage/app/ssh/mux/{$server->muxFilename()}";
@@ -212,7 +212,11 @@ function ensureMultiplexedConnection(Server $server)
    }

    $muxSocket = "/var/www/html/storage/app/ssh/mux/{$server->muxFilename()}";
-    $checkCommand = "ssh -O check -o ControlPath=$muxSocket {$server->user}@{$server->ip} 2>/dev/null";
+    $checkCommand = "ssh -O check -o ControlPath=$muxSocket ";
+    if (data_get($server, 'settings.is_cloudflare_tunnel')) {
+        $checkCommand .= '-o ProxyCommand="/usr/local/bin/cloudflared access ssh --hostname %h" ';
+    }
+    $checkCommand .= " {$server->user}@{$server->ip}";

    $process = Process::run($checkCommand);

@@ -233,8 +237,12 @@ function ensureMultiplexedConnection(Server $server)
    $serverInterval = config('constants.ssh.server_interval');
    $muxPersistTime = config('constants.ssh.mux_persist_time');

-    $establishCommand = "ssh -fNM -o ControlMaster=auto -o ControlPath=$muxSocket -o ControlPersist={$muxPersistTime} "
-        ."-i {$privateKeyLocation} "
+    $establishCommand = "ssh -fNM -o ControlMaster=auto -o ControlPath=$muxSocket -o ControlPersist={$muxPersistTime} ";
+
+    if (data_get($server, 'settings.is_cloudflare_tunnel')) {
+        $establishCommand .= '-o ProxyCommand="/usr/local/bin/cloudflared access ssh --hostname %h" ';
+    }
+    $establishCommand .= "-i {$privateKeyLocation} "
        .'-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null '
        .'-o PasswordAuthentication=no '
        ."-o ConnectTimeout=$connectionTimeout "
@@ -313,7 +321,7 @@ function instant_remote_process(Collection|array $command, Server $server, bool
    $end_time = microtime(true);

    $execution_time = ($end_time - $start_time) * 1000; // Convert to milliseconds
-    // ray('SSH command execution time:', $execution_time.' ms')->orange();
+    ray('SSH command execution time:', $execution_time.' ms')->orange();

    $output = trim($process->output());
    $exitCode = $process->exitCode();
--- a/composer.json
+++ b/composer.json
@@ -48,7 +48,6 @@
        "zircote/swagger-php": "^4.10"
    },
    "require-dev": {
-        "itsgoingd/clockwork": "^5.2",
        "fakerphp/faker": "^v1.21.0",
        "laravel/dusk": "^v8.0",
        "laravel/pint": "^1.16",
--- a/composer.lock
+++ b/composer.lock
--- a/config/constants.php
+++ b/config/constants.php
@@ -6,7 +6,8 @@ return [
        'contact' => 'https://coolify.io/docs/contact',
    ],
    'ssh' => [
-        'mux_enabled' => env('SSH_MUX_ENABLED', true),
+        // Using MUX
+        'mux_enabled' => env('MUX_ENABLED', env('SSH_MUX_ENABLED', true), true),
        'mux_persist_time' => env('SSH_MUX_PERSIST_TIME', '1h'),
        'connection_timeout' => 10,
        'server_interval' => 20,
--- a/config/coolify.php
+++ b/config/coolify.php
@@ -7,7 +7,6 @@ return [
    'self_hosted' => env('SELF_HOSTED', true),
    'waitlist' => env('WAITLIST', false),
    'license_url' => 'https://licenses.coollabs.io',
-    'mux_enabled' => env('MUX_ENABLED', true),
    'dev_webhook' => env('SERVEO_URL'),
    'is_windows_docker_desktop' => env('IS_WINDOWS_DOCKER_DESKTOP', false),
    'base_config_path' => env('BASE_CONFIG_PATH', '/data/coolify'),
--- a/config/sentry.php
+++ b/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.334',
+    'release' => '4.0.0-beta.335',
    // When left empty or `null` the Laravel environment will be used
    'environment' => config('app.env'),

--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php

-return '4.0.0-beta.334';
+return '4.0.0-beta.335';
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -48,6 +48,7 @@ services:
      - PUSHER_APP_SECRET
      - AUTOUPDATE
      - SELF_HOSTED
+      - SSH_MUX_ENABLED
      - SSH_MUX_PERSIST_TIME
      - FEEDBACK_DISCORD_WEBHOOK
      - WAITLIST
--- a/docker-compose.windows.yml
+++ b/docker-compose.windows.yml
@@ -45,7 +45,7 @@ services:
      - PUSHER_APP_SECRET
      - AUTOUPDATE=true
      - SELF_HOSTED=true
-      - MUX_ENABLED=false
+      - SSH_MUX_ENABLED=false
      - IS_WINDOWS_DOCKER_DESKTOP=true
    ports:
      - "${APP_PORT:-8000}:80"
--- a/versions.json
+++ b/versions.json
@@ -1,13 +1,13 @@
 {
    "coolify": {
        "v4": {
-            "version": "4.0.0-beta.334"
+            "version": "4.0.0-beta.335"
        },
        "nightly": {
-            "version": "4.0.0-beta.335"
+            "version": "4.0.0-beta.336"
        },
        "helper": {
            "version": "1.0.1"
        }
    }
-}
+}