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

make things more clear

Browse Source
This commit is contained in:
ayntk-ai
2024-08-27 14:19:37 +02:00
parent 9040f5d2a1
commit 4726676248
5 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Actions/Service/DeleteService.php
View File

@@ -10,7 +10,7 @@ class DeleteService
{
use AsAction;
public function handle(Service $service, bool $deleteConfigurations, bool $deleteVolumes, bool $deleteImages, bool $deleteConnectedNetworks)
public function handle(Service $service, bool $deleteConfigurations, bool $deleteVolumes, bool $dockerCleanup, bool $deleteConnectedNetworks)
{
try {
$server = data_get($service, 'server');
@@ -69,7 +69,7 @@ class DeleteService
$service->tags()->detach();
$service->forceDelete();
if ($deleteImages) {
if ($dockerCleanup) {
CleanupDocker::run($server, true);
}
}

6
app/Jobs/DeleteResourceJob.php
View File

@@ -33,7 +33,7 @@ class DeleteResourceJob implements ShouldBeEncrypted, ShouldQueue
public Application|Service|StandalonePostgresql|StandaloneRedis|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|StandaloneKeydb|StandaloneDragonfly|StandaloneClickhouse $resource,
public bool $deleteConfigurations,
public bool $deleteVolumes,
public bool $deleteImages,
public bool $dockerCleanup,
public bool $deleteConnectedNetworks
) {
}
@@ -60,7 +60,7 @@ class DeleteResourceJob implements ShouldBeEncrypted, ShouldQueue
break;
case 'service':
StopService::run($this->resource, true);
DeleteService::run($this->resource, $this->deleteConfigurations, $this->deleteVolumes, $this->deleteImages, $this->deleteConnectedNetworks);
DeleteService::run($this->resource, $this->deleteConfigurations, $this->deleteVolumes, $this->dockerCleanup, $this->deleteConnectedNetworks);
break;
}
@@ -80,7 +80,7 @@ class DeleteResourceJob implements ShouldBeEncrypted, ShouldQueue
|| $this->resource instanceof StandaloneDragonfly
|| $this->resource instanceof StandaloneClickhouse;
$server = data_get($this->resource, 'server') ?? data_get($this->resource, 'destination.server');
if (($this->deleteImages || $isDatabase) && $server) {
if (($this->dockerCleanup || $isDatabase) && $server) {
CleanupDocker::run($server, true);
}

4
app/Livewire/Project/Shared/Danger.php
View File

@@ -20,7 +20,7 @@ class Danger extends Component
public bool $delete_volumes = true;
public bool $delete_images = true;
public bool $docker_cleanup = true;
public bool $delete_connected_networks = true;
@@ -48,7 +48,7 @@ class Danger extends Component
$this->resource,
$this->delete_configurations,
$this->delete_volumes,
$this->delete_images,
$this->docker_cleanup,
$this->delete_connected_networks
);