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

refactor: Update CleanupHelperContainersJob to use more efficient Docker command

Browse Source
This commit is contained in:
Andras Bacsai
2024-09-20 10:08:37 +02:00
parent fc6f5d82db
commit f1881d5c35
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Jobs/CleanupHelperContainersJob.php
View File

@@ -21,11 +21,10 @@ class CleanupHelperContainersJob implements ShouldBeEncrypted, ShouldBeUnique, S
{ {
try { try {
ray('Cleaning up helper containers on '.$this->server->name); ray('Cleaning up helper containers on '.$this->server->name);
$containers = instant_remote_process(['docker container ps --filter "ancestor=ghcr.io/coollabsio/coolify-helper:next" --filter "ancestor=ghcr.io/coollabsio/coolify-helper:latest" --format \'{{json .}}\''], $this->server, false); $containers = instant_remote_process(['docker container ps --format \'{{json .}}\' | jq -s \'map(select(.Image | contains("ghcr.io/coollabsio/coolify-helper")))\''], $this->server, false);
$containers = format_docker_command_output_to_json($containers); $containerIds = collect(json_decode($containers))->pluck('ID');
if ($containers->count() > 0) { if ($containerIds->count() > 0) {
foreach ($containers as $container) { foreach ($containerIds as $containerId) {
$containerId = data_get($container, 'ID');
ray('Removing container '.$containerId); ray('Removing container '.$containerId);
instant_remote_process(['docker container rm -f '.$containerId], $this->server, false); instant_remote_process(['docker container rm -f '.$containerId], $this->server, false);
} }