starred/coolify
1
0
Fork 0
mirror of https://github.com/coollabsio/coolify.git synced 2026-11-06 13:10:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/next' into automation/sync-main-to-next

Browse Source
This commit is contained in:
Andras Bacsai
2026-10-26 12:40:59 +01:00
parent 8eb33ddf31 2796609e96
commit d8fe02464b
134 changed files with 4031 additions and 1325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/ApplicationSetting.php
+4 -2
View File
@@ -2,6 +2,7 @@
namespace App\Models;
use App\Services\Access\AccessResolver;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Model;
use OpenApi\Attributes as OA;
@@ -150,10 +151,11 @@ class ApplicationSetting extends Model
*/
public static function isContainerNamePrefixInUse(string $prefix, Server $server, ?int $ignoreApplicationId = null): bool
{
return $server->applications()->contains(function (Application $application) use ($prefix, $ignoreApplicationId) {
// Hidden applications of a scoped member still count, or two names on one server could collide.
return app(AccessResolver::class)->withoutVisibilityScope(fn () => $server->applications()->contains(function (Application $application) use ($prefix, $ignoreApplicationId) {
return $application->id !== $ignoreApplicationId
&& in_array($prefix, [$application->uuid, $application->settings->custom_container_name_prefix, $application->settings->custom_internal_name], true);
});
}));
}
public function stopGracePeriodSeconds(): int