dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

refactor(jobs): comment out unused Caddy label handling in ApplicationDeploymentJob and simplify proxy path logic in Server model

Browse Source
This commit is contained in:
Andras Bacsai
2025-04-20 17:58:41 +02:00
parent a26d816fe3
commit c388e30499
2 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/Jobs/ApplicationDeploymentJob.php
View File

@@ -1712,25 +1712,25 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
$labels = $labels->filter(function ($value, $key) {
return ! Str::startsWith($value, 'coolify.');
});
$found_caddy_labels = $labels->filter(function ($value, $key) {
return Str::startsWith($value, 'caddy_');
});
if ($found_caddy_labels->count() === 0) {
if ($this->pull_request_id !== 0) {
$domains = str(data_get($this->preview, 'fqdn'))->explode(',');
} else {
$domains = str(data_get($this->application, 'fqdn'))->explode(',');
}
$labels = $labels->merge(fqdnLabelsForCaddy(
network: $this->application->destination->network,
uuid: $this->application->uuid,
domains: $domains,
onlyPort: $onlyPort,
is_force_https_enabled: $this->application->isForceHttpsEnabled(),
is_gzip_enabled: $this->application->isGzipEnabled(),
is_stripprefix_enabled: $this->application->isStripprefixEnabled()
));
}
// $found_caddy_labels = $labels->filter(function ($value, $key) {
// return Str::startsWith($value, 'caddy_');
// });
// if ($found_caddy_labels->count() === 0) {
// if ($this->pull_request_id !== 0) {
// $domains = str(data_get($this->preview, 'fqdn'))->explode(',');
// } else {
// $domains = str(data_get($this->application, 'fqdn'))->explode(',');
// }
// $labels = $labels->merge(fqdnLabelsForCaddy(
// network: $this->application->destination->network,
// uuid: $this->application->uuid,
// domains: $domains,
// onlyPort: $onlyPort,
// is_force_https_enabled: $this->application->isForceHttpsEnabled(),
// is_gzip_enabled: $this->application->isGzipEnabled(),
// is_stripprefix_enabled: $this->application->isStripprefixEnabled()
// ));
// }
$this->application->custom_labels = base64_encode($labels->implode("\n"));
$this->application->save();
} else {

6
app/Models/Server.php
View File

@@ -492,11 +492,7 @@ $schema://$host {
if ($proxyType === ProxyTypes::TRAEFIK->value) {
// Do nothing
} elseif ($proxyType === ProxyTypes::CADDY->value) {
if (isDev()) {
$proxy_path = '/var/lib/docker/volumes/coolify_dev_coolify_data/_data/proxy/caddy';
} else {
$proxy_path = $proxy_path.'/caddy';
}
$proxy_path = $proxy_path.'/caddy';
} elseif ($proxyType === ProxyTypes::NGINX->value) {
if (isDev()) {
$proxy_path = '/var/lib/docker/volumes/coolify_dev_coolify_data/_data/proxy/nginx';