tiennm99/coolify
1
0 Fork 0
mirror of https://github.com/tiennm99/coolify.git synced 2026-10-13 20:14:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/next' into audit-policies

Browse Source
This commit is contained in:
Andras Bacsai committed 2026-06-15 12:05:19 +02:00
2 parents 8a2373e49f 52739141ee
commit 78d8afa602
203 files changed
+5440 -1096
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

bootstrap/helpers/shared.php
+8 -8
View File
@@ -1063,7 +1063,6 @@ function sslip(Server $server)
function get_service_templates(bool $force = false): Collection
{
if ($force) {
try {
$response = Http::retry(3, 1000)->get(config('constants.services.official'));
@@ -1074,15 +1073,16 @@ function get_service_templates(bool $force = false): Collection
return collect($services);
} catch (Throwable) {
$services = File::get(base_path('templates/'.config('constants.services.file_name')));
return collect(json_decode($services))->sortKeys();
return get_service_templates();
}
} else {
$services = File::get(base_path('templates/'.config('constants.services.file_name')));
return collect(json_decode($services))->sortKeys();
}
$path = base_path('templates/'.config('constants.services.file_name'));
$mtime = filemtime($path) ?: 0;
return Cache::remember("service-templates:{$mtime}", now()->addDay(), function () use ($path) {
return collect(json_decode(File::get($path)))->sortKeys();
});
}
function getResourceByUuid(string $uuid, ?int $teamId = null)