An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
Merge remote-tracking branch 'origin/next' into team-resource-audit-logging
Andras Bacsai8726746241b0
diff --cc app/Models/Application.phpindex 824e58a154,f802a65972..2fa1cff990--- a/app/Models/Application.php+++ b/app/Models/Application.php@@@ -122,10 -122,11 +123,8 @@@ use Symfony\Component\Yaml\Yamlclass Application extends BaseModel{- use ClearsGlobalSearchCache, HasConfiguration, HasMetrics, HasNoindexDomains, HasSafeStringAttribute, SoftDeletes;/** @use HasFactory<ApplicationFactory> */- use Auditable, HasFactory;- use HasFactory;--- use ClearsGlobalSearchCache, HasConfiguration, HasMetrics, HasNoindexDomains, HasSafeStringAttribute, SoftDeletes;- use HasSecretManager;++ use Auditable, ClearsGlobalSearchCache, HasConfiguration, HasFactory, HasMetrics, HasNoindexDomains, HasSafeStringAttribute, HasSecretManager, SoftDeletes;public const MAX_DOCKER_COMPOSE_SIZE_BYTES = 5 * 1024 * 1024;diff --cc app/Models/Service.phpindex 16d5673a86,2a30fb846e..429422b90e--- a/app/Models/Service.php+++ b/app/Models/Service.php@@@ -4,9 -4,9 +4,10 @@@ namespace App\Modelsuse App\Enums\ProcessStatus;use App\Services\ContainerStatusAggregator;+use App\Traits\Auditable;use App\Traits\ClearsGlobalSearchCache;use App\Traits\HasSafeStringAttribute;+ use App\Traits\HasSecretManager;use Illuminate\Database\Eloquent\Casts\Attribute;use Illuminate\Database\Eloquent\Factories\HasFactory;use Illuminate\Database\Eloquent\Relations\HasMany;@@@ -44,7 -44,7 +45,7 @@@ use Symfony\Component\Yaml\Yaml)]class Service extends BaseModel{- use Auditable, ClearsGlobalSearchCache, HasFactory, HasSafeStringAttribute, SoftDeletes;- use ClearsGlobalSearchCache, HasFactory, HasSafeStringAttribute, HasSecretManager, SoftDeletes;++ use Auditable, ClearsGlobalSearchCache, HasFactory, HasSafeStringAttribute, HasSecretManager, SoftDeletes;private static $parserVersion = '5';diff --cc app/Models/StandaloneClickhouse.phpindex e3e1c249f3,979c0ede80..8bfbf553f2--- a/app/Models/StandaloneClickhouse.php+++ b/app/Models/StandaloneClickhouse.php@@@ -13,7 -13,7 +14,7 @@@ use Illuminate\Database\Eloquent\SoftDeclass StandaloneClickhouse extends BaseModel{- use Auditable, ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, SoftDeletes;- use ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, HasSecretManager, SoftDeletes;++ use Auditable, ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, HasSecretManager, SoftDeletes;protected $fillable = ['uuid',diff --cc app/Models/StandaloneDragonfly.phpindex 9b0ec923b2,e9b7a3ffe0..da4804dd2d--- a/app/Models/StandaloneDragonfly.php+++ b/app/Models/StandaloneDragonfly.php@@@ -13,7 -13,7 +14,7 @@@ use Illuminate\Database\Eloquent\SoftDeclass StandaloneDragonfly extends BaseModel{- use Auditable, ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, SoftDeletes;- use ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, HasSecretManager, SoftDeletes;++ use Auditable, ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, HasSecretManager, SoftDeletes;protected $fillable = ['uuid',diff --cc app/Models/StandaloneKeydb.phpindex 7b1b20b2fe,1f66f2591e..f4dbaec210--- a/app/Models/StandaloneKeydb.php+++ b/app/Models/StandaloneKeydb.php@@@ -13,7 -13,7 +14,7 @@@ use Illuminate\Database\Eloquent\SoftDeclass StandaloneKeydb extends BaseModel{- use Auditable, ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, SoftDeletes;- use ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, HasSecretManager, SoftDeletes;++ use Auditable, ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, HasSecretManager, SoftDeletes;protected $fillable = ['uuid',diff --cc app/Models/StandaloneMariadb.phpindex 7ac68aa597,18fc8868ce..c923b489bd--- a/app/Models/StandaloneMariadb.php+++ b/app/Models/StandaloneMariadb.php@@@ -14,7 -14,7 +15,7 @@@ use Illuminate\Database\Eloquent\SoftDeclass StandaloneMariadb extends BaseModel{- use Auditable, ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, SoftDeletes;- use ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, HasSecretManager, SoftDeletes;++ use Auditable, ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, HasSecretManager, SoftDeletes;protected $fillable = ['uuid',diff --cc app/Models/StandaloneMongodb.phpindex 33fb862164,22c12b0677..70b108087a--- a/app/Models/StandaloneMongodb.php+++ b/app/Models/StandaloneMongodb.php@@@ -13,7 -13,7 +14,7 @@@ use Illuminate\Database\Eloquent\SoftDeclass StandaloneMongodb extends BaseModel{- use Auditable, ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, SoftDeletes;- use ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, HasSecretManager, SoftDeletes;++ use Auditable, ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, HasSecretManager, SoftDeletes;protected $fillable = ['uuid',diff --cc app/Models/StandaloneMysql.phpindex ec3c7b5795,cad1813436..6a08a4dc45--- a/app/Models/StandaloneMysql.php+++ b/app/Models/StandaloneMysql.php@@@ -13,7 -13,7 +14,7 @@@ use Illuminate\Database\Eloquent\SoftDeclass StandaloneMysql extends BaseModel{- use Auditable, ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, SoftDeletes;- use ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, HasSecretManager, SoftDeletes;++ use Auditable, ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, HasSecretManager, SoftDeletes;protected $fillable = ['uuid',diff --cc app/Models/StandalonePostgresql.phpindex 92796aea6a,adf0b38965..f8dc5c0caa--- a/app/Models/StandalonePostgresql.php+++ b/app/Models/StandalonePostgresql.php@@@ -13,7 -13,7 +14,7 @@@ use Illuminate\Database\Eloquent\SoftDeclass StandalonePostgresql extends BaseModel{- use Auditable, ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, SoftDeletes;- use ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, HasSecretManager, SoftDeletes;++ use Auditable, ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, HasSecretManager, SoftDeletes;protected $fillable = ['uuid',diff --cc app/Models/StandaloneRedis.phpindex f9877a16c7,25b53f78db..2575584ac6--- a/app/Models/StandaloneRedis.php+++ b/app/Models/StandaloneRedis.php@@@ -13,7 -13,7 +14,7 @@@ use Illuminate\Database\Eloquent\SoftDeclass StandaloneRedis extends BaseModel{- use Auditable, ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, SoftDeletes;- use ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, HasSecretManager, SoftDeletes;++ use Auditable, ClearsGlobalSearchCache, HasDatabaseHealthCheck, HasFactory, HasMetrics, HasSafeStringAttribute, HasSecretManager, SoftDeletes;protected $fillable = ['uuid',