mirror of
https://github.com/cupcakearmy/coolify.git
synced 2024-10-22 16:14:22 +02:00
Update service and shared helper files
This commit is contained in:
parent
74b24a0690
commit
4d319a8caa
@ -4,8 +4,8 @@
|
|||||||
use App\Models\Service;
|
use App\Models\Service;
|
||||||
use App\Models\ServiceApplication;
|
use App\Models\ServiceApplication;
|
||||||
use App\Models\ServiceDatabase;
|
use App\Models\ServiceDatabase;
|
||||||
use Illuminate\Support\Facades\Storage;
|
|
||||||
use Illuminate\Support\Str;
|
use Illuminate\Support\Str;
|
||||||
|
use Spatie\Url\Url;
|
||||||
use Symfony\Component\Yaml\Yaml;
|
use Symfony\Component\Yaml\Yaml;
|
||||||
|
|
||||||
function replaceRegex(?string $name = null)
|
function replaceRegex(?string $name = null)
|
||||||
@ -95,12 +95,17 @@ function updateCompose($resource)
|
|||||||
// Update FQDN
|
// Update FQDN
|
||||||
$variableName = "SERVICE_FQDN_" . Str::of($resource->name)->upper();
|
$variableName = "SERVICE_FQDN_" . Str::of($resource->name)->upper();
|
||||||
$generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
|
$generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
|
||||||
|
$fqdn = Url::fromString($resource->fqdn);
|
||||||
|
$fqdn = $fqdn->getScheme() . '://' . $fqdn->getHost();
|
||||||
if ($generatedEnv) {
|
if ($generatedEnv) {
|
||||||
$generatedEnv->value = $resource->fqdn;
|
$generatedEnv->value = $fqdn;
|
||||||
$generatedEnv->save();
|
$generatedEnv->save();
|
||||||
}
|
}
|
||||||
$variableName = "SERVICE_URL_" . Str::of($resource->name)->upper();
|
$variableName = "SERVICE_URL_" . Str::of($resource->name)->upper();
|
||||||
$generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
|
$generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
|
||||||
|
$url = Url::fromString($resource->fqdn);
|
||||||
|
$url = $url->getHost();
|
||||||
|
ray($url);
|
||||||
if ($generatedEnv) {
|
if ($generatedEnv) {
|
||||||
$url = Str::of($resource->fqdn)->after('://');
|
$url = Str::of($resource->fqdn)->after('://');
|
||||||
$generatedEnv->value = $url;
|
$generatedEnv->value = $url;
|
||||||
|
@ -974,13 +974,12 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
|
|||||||
'is_preview' => false,
|
'is_preview' => false,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
// if (!$isDatabase) {
|
if (!$isDatabase) {
|
||||||
// ray($savedService,$fqdn);
|
if ($command->value() === 'FQDN' && is_null($savedService->fqdn) && !$foundEnv) {
|
||||||
// if ($command->value() === 'FQDN' && is_null($savedService->fqdn)) {
|
$savedService->fqdn = $fqdn;
|
||||||
// $savedService->fqdn = $fqdn;
|
$savedService->save();
|
||||||
// $savedService->save();
|
}
|
||||||
// }
|
}
|
||||||
// }
|
|
||||||
} else {
|
} else {
|
||||||
$generatedValue = generateEnvValue($command);
|
$generatedValue = generateEnvValue($command);
|
||||||
if (!$foundEnv) {
|
if (!$foundEnv) {
|
||||||
|
Loading…
Reference in New Issue
Block a user