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

feat(previews): implement soft delete and cleanup for ApplicationPreview, enhancing resource management in DeleteResourceJob

Browse Source
This commit is contained in:
Andras Bacsai
2025-07-14 21:17:40 +02:00
parent 5bdf2e8481
commit 13f10028db
4 changed files with 129 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/Models/ApplicationPreview.php
View File

@@ -2,19 +2,25 @@
namespace App\Models;
use Illuminate\Database\Eloquent\SoftDeletes;
use Spatie\Url\Url;
use Visus\Cuid2\Cuid2;
class ApplicationPreview extends BaseModel
{
use SoftDeletes;
protected $guarded = [];
protected static function booted()
{
static::deleting(function ($preview) {
static::forceDeleting(function ($preview) {
$server = $preview->application->destination->server;
$application = $preview->application;
if (data_get($preview, 'application.build_pack') === 'dockercompose') {
$server = $preview->application->destination->server;
$composeFile = $preview->application->parse(pull_request_id: $preview->pull_request_id);
// Docker Compose volume and network cleanup
$composeFile = $application->parse(pull_request_id: $preview->pull_request_id);
$volumes = data_get($composeFile, 'volumes');
$networks = data_get($composeFile, 'networks');
$networkKeys = collect($networks)->keys();
@@ -26,7 +32,18 @@ class ApplicationPreview extends BaseModel
instant_remote_process(["docker network disconnect $key coolify-proxy"], $server, false);
instant_remote_process(["docker network rm $key"], $server, false);
});
} else {
// Regular application volume cleanup
$persistentStorages = $preview->persistentStorages()->get() ?? collect();
if ($persistentStorages->count() > 0) {
foreach ($persistentStorages as $storage) {
instant_remote_process(["docker volume rm -f $storage->name"], $server, false);
}
}
}
// Clean up persistent storage records
$preview->persistentStorages()->delete();
});
static::saving(function ($preview) {
if ($preview->isDirty('status')) {
@@ -50,6 +67,11 @@ class ApplicationPreview extends BaseModel
return $this->belongsTo(Application::class);
}
public function persistentStorages()
{
return $this->morphMany(\App\Models\LocalPersistentVolume::class, 'resource');
}
public function generate_preview_fqdn()
{
if (is_null($this->fqdn) && $this->application->fqdn) {