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

fix: service_url should not have a trailing slash

Browse Source
This commit is contained in:
Andras Bacsai
2024-08-05 13:42:51 +02:00
parent 1d8c496906
commit 76c39a987c
1 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
bootstrap/helpers/services.php
View File

@@ -122,14 +122,22 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
$path = $fqdn->getPath(); $path = $fqdn->getPath();
$fqdn = $fqdn->getScheme().'://'.$fqdn->getHost(); $fqdn = $fqdn->getScheme().'://'.$fqdn->getHost();
if ($generatedEnv) { if ($generatedEnv) {
$generatedEnv->value = $fqdn.$path; if ($path === '/') {
$generatedEnv->value = $fqdn;
} else {
$generatedEnv->value = $fqdn.$path;
}
$generatedEnv->save(); $generatedEnv->save();
} }
if ($port) { if ($port) {
$variableName = $variableName."_$port"; $variableName = $variableName."_$port";
$generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first(); $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
if ($generatedEnv) { if ($generatedEnv) {
$generatedEnv->value = $fqdn.$path; if ($path === '/') {
$generatedEnv->value = $fqdn;
} else {
$generatedEnv->value = $fqdn.$path;
}
$generatedEnv->save(); $generatedEnv->save();
} }
} }
@@ -141,14 +149,22 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
$url = $url->getHost(); $url = $url->getHost();
if ($generatedEnv) { if ($generatedEnv) {
$url = str($fqdn)->after('://'); $url = str($fqdn)->after('://');
$generatedEnv->value = $url.$path; if ($path === '/') {
$generatedEnv->value = $url;
} else {
$generatedEnv->value = $url.$path;
}
$generatedEnv->save(); $generatedEnv->save();
} }
if ($port) { if ($port) {
$variableName = $variableName."_$port"; $variableName = $variableName."_$port";
$generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first(); $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
if ($generatedEnv) { if ($generatedEnv) {
$generatedEnv->value = $url.$path; if ($path === '/') {
$generatedEnv->value = $url;
} else {
$generatedEnv->value = $url.$path;
}
$generatedEnv->save(); $generatedEnv->save();
} }
} }
@@ -165,10 +181,18 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
$service_fqdn = str($port_env->key)->beforeLast('_')->after('SERVICE_FQDN_'); $service_fqdn = str($port_env->key)->beforeLast('_')->after('SERVICE_FQDN_');
$env = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'SERVICE_FQDN_'.$service_fqdn)->first(); $env = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'SERVICE_FQDN_'.$service_fqdn)->first();
if ($env) { if ($env) {
$env->value = $host.$path; if ($path === '/') {
$env->value = $host;
} else {
$env->value = $host.$path;
}
$env->save(); $env->save();
} }
$port_env->value = $host.$path; if ($path === '/') {
$port_env->value = $host;
} else {
$port_env->value = $host.$path;
}
$port_env->save(); $port_env->save();
} }
$port_envs_url = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'like', "SERVICE_URL_%_$port")->get(); $port_envs_url = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'like', "SERVICE_URL_%_$port")->get();
@@ -176,10 +200,18 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
$service_url = str($port_env_url->key)->beforeLast('_')->after('SERVICE_URL_'); $service_url = str($port_env_url->key)->beforeLast('_')->after('SERVICE_URL_');
$env = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'SERVICE_URL_'.$service_url)->first(); $env = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'SERVICE_URL_'.$service_url)->first();
if ($env) { if ($env) {
$env->value = $url.$path; if ($path === '/') {
$env->value = $url;
} else {
$env->value = $url.$path;
}
$env->save(); $env->save();
} }
$port_env_url->value = $url.$path; if ($path === '/') {
$port_env_url->value = $url;
} else {
$port_env_url->value = $url.$path;
}
$port_env_url->save(); $port_env_url->save();
} }
} else { } else {