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

chore: Refactor instanceSettings() function and improve code readability

Browse Source
This commit is contained in:
Andras Bacsai
2024-10-01 11:36:37 +02:00
parent 5a770f9ddb
commit b00828d4aa
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/Models/Service.php
View File

@@ -966,7 +966,7 @@ class Service extends BaseModel
'service_uuid' => data_get($this, 'uuid'), 'service_uuid' => data_get($this, 'uuid'),
'task_uuid' => $task_uuid, 'task_uuid' => $task_uuid,
]); ]);
$settings = instanceSettings(); $settings = InstanceSettings::get();
if (data_get($settings, 'fqdn')) { if (data_get($settings, 'fqdn')) {
$url = Url::fromString($route); $url = Url::fromString($route);
$url = $url->withPort(null); $url = $url->withPort(null);
@@ -1095,7 +1095,22 @@ class Service extends BaseModel
return 3; return 3;
}); });
foreach ($sorted as $env) { foreach ($sorted as $env) {
$commands[] = "echo '{$env->key}={$env->real_value}' >> .env"; if (version_compare($env->version, '4.0.0-beta.347', '<=')) {
$commands[] = "echo '{$env->key}={$env->real_value}' >> .env";
} else {
$real_value = $env->real_value;
if ($env->version === '4.0.0-beta.239') {
$real_value = $env->real_value;
} else {
if ($env->is_literal || $env->is_multiline) {
$real_value = '\''.$real_value.'\'';
} else {
$real_value = escapeEnvVariables($env->real_value);
}
}
ray("echo \"{$env->key}={$real_value}\" >> .env");
$commands[] = "echo \"{$env->key}={$real_value}\" >> .env";
}
} }
if ($sorted->count() === 0) { if ($sorted->count() === 0) {
$commands[] = 'touch .env'; $commands[] = 'touch .env';