feat: experimental caddy support

app/Actions/Proxy/CheckConfiguration.php

@@ -11,7 +11,12 @@ class CheckConfiguration
     use AsAction;
     public function handle(Server $server, bool $reset = false)
     {
-        $proxy_path = get_proxy_path();
+        $proxyType = $server->proxyType();
+        if ($proxyType === 'NONE') {
+            return 'OK';
+        }
+        $proxy_path = $server->proxyPath();
+
         $proxy_configuration = instant_remote_process([
             "mkdir -p $proxy_path",
             "cat $proxy_path/docker-compose.yml",

app/Actions/Proxy/CheckProxy.php

@@ -10,6 +10,9 @@ class CheckProxy
     use AsAction;
     public function handle(Server $server, $fromUI = false)
     {
+        if ($server->proxyType() === 'NONE') {
+            return false;
+        }
         if (!$server->isProxyShouldRun()) {
             if ($fromUI) {
                 throw new \Exception("Proxy should not run. You selected the Custom Proxy.");

app/Actions/Proxy/SaveConfiguration.php

@@ -15,7 +15,7 @@ public function handle(Server $server, ?string $proxy_settings = null)
         if (is_null($proxy_settings)) {
             $proxy_settings = CheckConfiguration::run($server, true);
         }
-        $proxy_path = get_proxy_path();
+        $proxy_path = $server->proxyPath();
         $docker_compose_yml_base64 = base64_encode($proxy_settings);
 
         $server->proxy->last_saved_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;

app/Actions/Proxy/StartProxy.php

@@ -15,11 +15,11 @@ public function handle(Server $server, bool $async = true): string|Activity
     {
         try {
             $proxyType = $server->proxyType();
-            if ($proxyType === 'NONE') {
+            if (is_null($proxyType) || $proxyType === 'NONE') {
                 return 'OK';
             }
             $commands = collect([]);
-            $proxy_path = get_proxy_path();
+            $proxy_path = $server->proxyPath();
             $configuration = CheckConfiguration::run($server);
             if (!$configuration) {
                 throw new \Exception("Configuration is not synced");

app/Livewire/Boarding/Index.php

@@ -126,6 +126,7 @@ public function selectExistingServer()
     }
     public function getProxyType()
     {
+        // Set Default Proxy Type
         $this->selectProxy(ProxyTypes::TRAEFIK_V2->value);
         // $proxyTypeSet = $this->createdServer->proxy->type;
         // if (!$proxyTypeSet) {

app/Livewire/Project/Application/General.php

@@ -124,7 +124,7 @@ public function mount()
         }
         $this->isConfigurationChanged = $this->application->isConfigurationChanged();
         $this->customLabels = $this->application->parseContainerLabels();
-        if (!$this->customLabels && $this->application->destination->server->proxyType() === 'TRAEFIK_V2') {
+        if (!$this->customLabels && $this->application->destination->server->proxyType() !== 'NONE') {
             $this->customLabels = str(implode("|", generateLabelsApplication($this->application)))->replace("|", "\n");
             $this->application->custom_labels = base64_encode($this->customLabels);
             $this->application->save();
@@ -224,7 +224,7 @@ public function updatedApplicationFqdn()
     public function submit($showToaster = true)
     {
         try {
-            if (!$this->customLabels && $this->application->destination->server->proxyType() === 'TRAEFIK_V2') {
+            if (!$this->customLabels && $this->application->destination->server->proxyType() !== 'NONE') {
                 $this->customLabels = str(implode("|", generateLabelsApplication($this->application)))->replace("|", "\n");
                 $this->application->custom_labels = base64_encode($this->customLabels);
                 $this->application->save();

app/Livewire/Project/Shared/ResourceOperations.php

@@ -45,7 +45,7 @@ public function cloneTo($destination_id)
                 'destination_id' => $new_destination->id,
             ]);
             $new_resource->save();
-            if ($new_resource->destination->server->proxyType() === 'TRAEFIK_V2') {
+            if ($new_resource->destination->server->proxyType() !== 'NONE') {
                 $customLabels = str(implode("|", generateLabelsApplication($new_resource)))->replace("|", "\n");
                 $new_resource->custom_labels = base64_encode($customLabels);
                 $new_resource->save();

app/Livewire/Server/New/ByIp.php

@@ -89,6 +89,7 @@ public function submit()
                 'team_id' => currentTeam()->id,
                 'private_key_id' => $this->private_key_id,
                 'proxy' => [
+                    // set default proxy type to traefik v2
                     "type" => ProxyTypes::TRAEFIK_V2->value,
                     "status" => ProxyStatus::EXITED->value,
                 ],

app/Livewire/Server/Proxy/DynamicConfigurationNavbar.php

@@ -14,7 +14,7 @@ class DynamicConfigurationNavbar extends Component
     public function delete(string $fileName)
     {
         $server = Server::ownedByCurrentTeam()->whereId($this->server_id)->first();
-        $proxy_path = get_proxy_path();
+        $proxy_path = $server->proxyPath();
         $file = str_replace('|', '.', $fileName);
         instant_remote_process(["rm -f {$proxy_path}/dynamic/{$file}"], $server);
         $this->dispatch('success', 'File deleted.');

app/Livewire/Server/Proxy/DynamicConfigurations.php

@@ -17,7 +17,7 @@ class DynamicConfigurations extends Component
     ];
     public function loadDynamicConfigurations()
     {
-        $proxy_path = get_proxy_path();
+        $proxy_path = $this->server->proxyPath();
         $files = instant_remote_process(["mkdir -p $proxy_path/dynamic && ls -1 {$proxy_path}/dynamic"], $this->server);
         $files = collect(explode("\n", $files))->filter(fn ($file) => !empty($file));
         $files = $files->map(fn ($file) => trim($file));

app/Livewire/Server/Proxy/NewDynamicConfiguration.php

@@ -46,7 +46,7 @@ public function addDynamicConfiguration()
                 $this->dispatch('error', 'File name is reserved.');
                 return;
             }
-            $proxy_path = get_proxy_path();
+            $proxy_path = $this->proxyPath();
             $file = "{$proxy_path}/dynamic/{$this->fileName}";
             if ($this->newFile) {
                 $exists = instant_remote_process(["test -f $file && echo 1 || echo 0"], $this->server);

app/Models/Server.php

@@ -118,17 +118,30 @@ public function addInitialNetwork()
             }
         }
     }
+    public function proxyPath() {
+        $base_path = config('coolify.base_config_path');
+        $proxyType = $this->proxyType();
+        $proxy_path = "$base_path/proxy";
+        if ($proxyType === ProxyTypes::TRAEFIK_V2->value) {
+            $proxy_path = $proxy_path;
+        } else if ($proxyType === ProxyTypes::CADDY->value) {
+            $proxy_path = $proxy_path . '/caddy';
+        } else if ($proxyType === ProxyTypes::NGINX->value) {
+            $proxy_path = $proxy_path . '/nginx';
+        }
+        return $proxy_path;
+    }
     public function proxyType()
     {
         $proxyType = $this->proxy->get('type');
         if ($proxyType === ProxyTypes::NONE->value) {
             return $proxyType;
         }
-        if (is_null($proxyType)) {
+        // if (is_null($proxyType)) {
-            $this->proxy->type = ProxyTypes::TRAEFIK_V2->value;
+        //     $this->proxy->type = ProxyTypes::TRAEFIK_V2->value;
-            $this->proxy->status = ProxyStatus::EXITED->value;
+        //     $this->proxy->status = ProxyStatus::EXITED->value;
-            $this->save();
+        //     $this->save();
-        }
+        // }
         return $this->proxy->get('type');
     }
     public function scopeWithProxy(): Builder

bootstrap/helpers/docker.php

@@ -1,5 +1,6 @@
 <?php
 
+use App\Enums\ProxyTypes;
 use App\Models\Application;
 use App\Models\ApplicationPreview;
 use App\Models\Server;
@@ -215,6 +216,46 @@ function generateServiceSpecificFqdns(ServiceApplication|Application $resource,
     }
     return $payload;
 }
+function fqdnLabelsForCaddy(string $network, string $uuid, Collection $domains, bool $is_force_https_enabled = false, $onlyPort = null, ?Collection $serviceLabels = null, ?bool $is_gzip_enabled = true, ?bool $is_stripprefix_enabled = true, ?string $service_name = null)
+{
+    $labels = collect([]);
+    foreach ($domains as $loop => $domain) {
+        $loop = $loop;
+        $url = Url::fromString($domain);
+        $host = $url->getHost();
+        $path = $url->getPath();
+        // $stripped_path = str($path)->replaceEnd('/', '');
+
+        $schema = $url->getScheme();
+        $port = $url->getPort();
+        if (is_null($port) && !is_null($onlyPort)) {
+            $port = $onlyPort;
+        }
+        $labels->push("caddy_{$loop}={$schema}://{$host}");
+        $labels->push("caddy_{$loop}.header=-Server");
+
+        if ($serviceLabels) {
+            $labels->push("caddy_ingress_network={$uuid}");
+            $labels->push("caddy_{$loop}.reverse_proxy={{upstreams}}");
+        } else {
+            $labels->push("caddy_ingress_network={$network}");
+            if ($port) {
+                $labels->push("caddy_{$loop}.handle_path.{$loop}_reverse_proxy={{upstreams $port}}");
+            } else {
+                $labels->push("caddy_{$loop}.handle_path.{$loop}_reverse_proxy={{upstreams}}");
+            }
+            $labels->push("caddy_{$loop}.handle_path={$path}*");
+        }
+
+        if ($is_gzip_enabled) {
+            $labels->push("caddy_{$loop}.encode=zstd gzip");
+        }
+        if (isDev()) {
+            // $labels->push("caddy_{$loop}.tls=internal");
+        }
+    }
+    return $labels->sort();
+}
 function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_https_enabled = false, $onlyPort = null, ?Collection $serviceLabels = null, ?bool $is_gzip_enabled = true, ?bool $is_stripprefix_enabled = true, ?string $service_name = null)
 {
     $labels = collect([]);
@@ -395,7 +436,7 @@ function generateLabelsApplication(Application $application, ?ApplicationPreview
         } else {
             $domains = Str::of(data_get($application, 'fqdn'))->explode(',');
         }
-        // Add Traefik labels no matter which proxy is selected
+        // Add Traefik labels
         $labels = $labels->merge(fqdnLabelsForTraefik(
             uuid: $appUuid,
             domains: $domains,
@@ -404,6 +445,16 @@ function generateLabelsApplication(Application $application, ?ApplicationPreview
             is_gzip_enabled: $application->isGzipEnabled(),
             is_stripprefix_enabled: $application->isStripprefixEnabled()
         ));
+        // Add Caddy labels
+        $labels = $labels->merge(fqdnLabelsForCaddy(
+            network: $application->destination->network,
+            uuid: $appUuid,
+            domains: $domains,
+            onlyPort: $onlyPort,
+            is_force_https_enabled: $application->isForceHttpsEnabled(),
+            is_gzip_enabled: $application->isGzipEnabled(),
+            is_stripprefix_enabled: $application->isStripprefixEnabled()
+        ));
     }
     return $labels->all();
 }

bootstrap/helpers/proxy.php

@@ -7,12 +7,7 @@
 use Spatie\Url\Url;
 use Symfony\Component\Yaml\Yaml;
 
-function get_proxy_path()
+
-{
-    $base_path = config('coolify.base_config_path');
-    $proxy_path = "$base_path/proxy";
-    return $proxy_path;
-}
 function connectProxyToNetworks(Server $server)
 {
     if ($server->isSwarm()) {
@@ -75,7 +70,9 @@ function connectProxyToNetworks(Server $server)
 }
 function generate_default_proxy_configuration(Server $server)
 {
-    $proxy_path = get_proxy_path();
+    $proxy_path = $server->proxyPath();
+    $proxy_type = $server->proxyType();
+
     if ($server->isSwarm()) {
         $networks = collect($server->swarmDockers)->map(function ($docker) {
             return $docker['network'];
@@ -98,6 +95,7 @@ function generate_default_proxy_configuration(Server $server)
             "external" => true,
         ];
     });
+    if ($proxy_type === 'TRAEFIK_V2') {
         $labels = [
             "traefik.enable=true",
             "traefik.http.routers.traefik.entrypoints=http",
@@ -176,15 +174,50 @@ function generate_default_proxy_configuration(Server $server)
         } else {
             $config['services']['traefik']['command'][] = "--providers.docker=true";
         }
+    } else if ($proxy_type === 'CADDY') {
+        $config = [
+            "version" => "3.8",
+            "networks" => $array_of_networks->toArray(),
+            "services" => [
+                "caddy" => [
+                    "container_name" => "coolify-proxy",
+                    "image" => "lucaslorentz/caddy-docker-proxy:2.8-alpine",
+                    "restart" => RESTART_MODE,
+                    "extra_hosts" => [
+                        "host.docker.internal:host-gateway",
+                    ],
+                    "networks" => $networks->toArray(),
+                    "ports" => [
+                        "80:80",
+                        "443:443",
+                    ],
+                    // "healthcheck" => [
+                    //     "test" => "wget -qO- http://localhost:80|| exit 1",
+                    //     "interval" => "4s",
+                    //     "timeout" => "2s",
+                    //     "retries" => 5,
+                    // ],
+                    "volumes" => [
+                        "/var/run/docker.sock:/var/run/docker.sock:ro",
+                        "{$proxy_path}/config:/config",
+                        "{$proxy_path}/data:/data",
+                    ],
+                ],
+            ],
+        ];
+    } else {
+        return null;
+    }
+
     $config = Yaml::dump($config, 12, 2);
     SaveConfiguration::run($server, $config);
     return $config;
 }
 function setup_dynamic_configuration()
 {
-    $dynamic_config_path = get_proxy_path() . "/dynamic";
     $settings = InstanceSettings::get();
     $server = Server::find(0);
+    $dynamic_config_path = $server->proxyPath() . "/dynamic";
     if ($server) {
         $file = "$dynamic_config_path/coolify.yaml";
         if (empty($settings->fqdn)) {
@@ -308,7 +341,7 @@ function setup_dynamic_configuration()
 }
 function setup_default_redirect_404(string|null $redirect_url, Server $server)
 {
-    $traefik_dynamic_conf_path = get_proxy_path() . "/dynamic";
+    $traefik_dynamic_conf_path = $server->proxyPath() . "/dynamic";
     $traefik_default_redirect_file = "$traefik_dynamic_conf_path/default_redirect_404.yaml";
     if (empty($redirect_url)) {
         instant_remote_process([

bootstrap/helpers/shared.php

@@ -1056,6 +1056,16 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                             is_stripprefix_enabled: $savedService->isStripprefixEnabled(),
                             service_name: $serviceName
                         ));
+                        $serviceLabels = $serviceLabels->merge(fqdnLabelsForCaddy(
+                            network: $resource->destination->network,
+                            uuid: $resource->uuid,
+                            domains: $fqdns,
+                            is_force_https_enabled: true,
+                            serviceLabels: $serviceLabels,
+                            is_gzip_enabled: $savedService->isGzipEnabled(),
+                            is_stripprefix_enabled: $savedService->isStripprefixEnabled(),
+                            service_name: $serviceName
+                        ));
                     }
                 }
                 if ($resource->server->isLogDrainEnabled() && $savedService->isLogDrainEnabled()) {
@@ -1495,7 +1505,17 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                                 return $preview_fqdn;
                             });
                         }
-                        $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik($uuid, $fqdns, serviceLabels: $serviceLabels));
+                        $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(
+                            uuid: $uuid,
+                            domains: $fqdns,
+                            serviceLabels: $serviceLabels
+                        ));
+                        $serviceLabels = $serviceLabels->merge(fqdnLabelsForCaddy(
+                            network: $resource->destination->network,
+                            uuid: $uuid,
+                            domains: $fqdns,
+                            serviceLabels: $serviceLabels
+                        ));
                     }
                 }
             }

config/sentry.php

@@ -3,7 +3,7 @@
 return [
 
     // @see https://docs.sentry.io/product/sentry-basics/dsn-explainer/
-    'dsn' => 'https://1bbc8f762199a52aee39196adb3e8d1a@o1082494.ingest.sentry.io/4505347448045568',
+    'dsn' => 'https://f0b0e6be13926d4ac68d68d51d38db8f@o1082494.ingest.us.sentry.io/4505347448045568',
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))

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

@@ -4,11 +4,13 @@
             href="{{ route('server.proxy', $parameters) }}">
             <button>Configuration</button>
         </a>
-        @if (data_get($server, 'proxy.type') !== 'NONE')
+        @if ($server->proxyType() !== 'NONE')
+            @if ($server->proxyType() === 'TRAEFIK_V2')
                 <a class="{{ request()->routeIs('server.proxy.dynamic-confs') ? 'text-white' : '' }}"
                     href="{{ route('server.proxy.dynamic-confs', $parameters) }}">
                     <button>Dynamic Configurations</button>
                 </a>
+            @endif
             <a class="{{ request()->routeIs('server.proxy.logs') ? 'text-white' : '' }}"
                 href="{{ route('server.proxy.logs', $parameters) }}">
                 <button>Logs</button>

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

@@ -1,16 +1,24 @@
 <div>
     @if (data_get($server, 'proxy.type'))
         <div x-init="$wire.loadProxyConfiguration">
-            @if ($selectedProxy === 'TRAEFIK_V2')
+            @if ($selectedProxy !== 'NONE')
                 <form wire:submit='submit'>
                     <div class="flex items-center gap-2">
                         <h2>Configuration</h2>
-                        <x-forms.button type="submit">Save</x-forms.button>
                         @if ($server->proxy->status === 'exited')
                             <x-forms.button wire:click.prevent="change_proxy">Switch Proxy</x-forms.button>
+                        @else
+                            <x-forms.button disabled wire:click.prevent="change_proxy">Switch Proxy</x-forms.button>
                         @endif
+                        <x-forms.button type="submit">Save</x-forms.button>
+
                     </div>
-                    <div class="pt-3 pb-4 ">Traefik v2</div>
+                    <div class="pb-4 ">Before switching proxies, please read <a>this</a>.</div>
+                    @if ($server->proxyType() === 'TRAEFIK_V2')
+                        <div class="pb-4">Traefik v2</div>
+                    @elseif ($server->proxyType() === 'CADDY')
+                        <div class="pb-4 ">Caddy</div>
+                    @endif
                     @if (
                         $server->proxy->last_applied_settings &&
                             $server->proxy->last_saved_settings !== $server->proxy->last_applied_settings)
@@ -18,15 +26,18 @@
                             configurations.
                         </div>
                     @endif
-                    <x-forms.input placeholder="https://app.coolify.io" id="redirect_url" label="Default Redirect 404"
+                    @if ($server->proxyType() === 'TRAEFIK_V2')
+                        <x-forms.input placeholder="https://app.coolify.io" id="redirect_url"
+                            label="Default Redirect 404"
                             helper="All urls that has no service available will be redirected to this domain." />
+                    @endif
                     <div wire:loading wire:target="loadProxyConfiguration" class="pt-4">
                         <x-loading text="Loading proxy configuration..." />
                     </div>
                     <div wire:loading.remove wire:target="loadProxyConfiguration">
                         @if ($proxy_settings)
                             <div class="flex flex-col gap-2 pt-4">
-                                <x-forms.textarea label="Configuration file: traefik.conf" name="proxy_settings"
+                                <x-forms.textarea label="Configuration file" name="proxy_settings"
                                     wire:model="proxy_settings" rows="30" />
                                 <x-forms.button wire:click.prevent="reset_proxy_configuration">
                                     Reset configuration to default
@@ -40,7 +51,7 @@
                     <h2>Configuration</h2>
                     <x-forms.button wire:click.prevent="change_proxy">Switch Proxy</x-forms.button>
                 </div>
-                <div class="pt-3 pb-4">Custom (None) Proxy Selected</div>
+                <div class="pt-2 pb-4">Custom (None) Proxy Selected</div>
             @else
                 <div class="flex items-center gap-2">
                     <h2>Configuration</h2>
@@ -57,14 +68,13 @@
                     </x-forms.button>
                     <x-forms.button class="box" wire:click="select_proxy('TRAEFIK_V2')">
                         Traefik
-                        v2
+                    </x-forms.button>
+                    <x-forms.button class="box" wire:click="select_proxy('CADDY')">
+                        Caddy (experimental)
                     </x-forms.button>
                     <x-forms.button disabled class="box">
                         Nginx
                     </x-forms.button>
-                    <x-forms.button disabled class="box">
-                        Caddy
-                    </x-forms.button>
                 </div>
             </div>
     @endif