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

fix(docker-cleanup): remove old Coolify images on Docker 29

Browse Source 
Remove old helper, realtime and sentinel images by name with --format
instead of parsing the default table, which changed in Docker 29. Also
remove unused images pulled by digest.

Closes #12148

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Andras Bacsai
2026-10-15 22:25:21 +02:00
co-authored by Claude Opus 5.5
parent 5696d404c6
commit 667ae3cdcb
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Actions/Server/CleanupDocker.php
+21 -8
View File
@@ -131,10 +131,7 @@ class CleanupDocker implements ShouldBeUnique
}
}
$helperImageVersion = getHelperVersion();
$helperImage = coolifyHelperImage();
$helperImageWithVersion = "$helperImage:$helperImageVersion";
$helperImageWithoutPrefix = 'coollabsio/coolify-helper';
$helperImageWithoutPrefixVersion = "coollabsio/coolify-helper:$helperImageVersion";
$helperImageWithVersion = coolifyHelperImage().":$helperImageVersion";
$buildxMetadataVolume = isDev() && $server->isLocalhost()
? 'coolify-buildx'
: '$HOME/.docker/buildx';
@@ -165,8 +162,7 @@ class CleanupDocker implements ShouldBeUnique
$imagePruneCmd,
'docker builder prune -af',
"docker run --rm -v {$buildxMetadataVolume}:/root/.docker/buildx -v /var/run/docker.sock:/var/run/docker.sock {$helperImageWithVersion} docker buildx prune --builder coolify-railpack -af 2>/dev/null || true",
"docker images --filter before=$helperImageWithVersion --filter reference=$helperImage | grep $helperImage | awk '{print $3}' | xargs -r docker rmi -f",
"docker images --filter before=$helperImageWithoutPrefixVersion --filter reference=$helperImageWithoutPrefix | grep $helperImageWithoutPrefix | awk '{print $3}' | xargs -r docker rmi -f",
$this->buildCoolifyImageCleanupCommand($helperImageVersion),
];
if ($deleteUnusedVolumes) {
@@ -221,6 +217,22 @@ class CleanupDocker implements ShouldBeUnique
"awk '{print $1}' | xargs -r docker rm";
}
/**
* Build a command that removes unused images of the Coolify helper, realtime and sentinel,
* from any registry. They have the coolify.managed=true label, so the generic image prune
* skips them. The current helper version stays, and docker rmi (without -f) keeps images
* that a container uses, for example the running sentinel.
*/
private function buildCoolifyImageCleanupCommand(string $helperImageVersion): string
{
$escapedHelperVersion = preg_replace('/([.\\\\+*?\[\]^$(){}|])/', '\\\\$1', $helperImageVersion);
return "docker images --format '{{.Repository}}:{{.Tag}}' | ".
"grep -E '(^|/)coollabsio/(coolify-helper|coolify-realtime|sentinel):' | ".
"grep -v -E ':<none>$|(^|/)coollabsio/coolify-helper:{$escapedHelperVersion}$' | ".
'xargs -r docker rmi 2>/dev/null || true';
}
/**
* Build a docker image prune command that excludes application image repositories.
*
@@ -256,17 +268,18 @@ class CleanupDocker implements ShouldBeUnique
// - Don't have coolify.managed=true label
// Images in use by containers will fail silently with docker rmi
// Pattern matches both uuid:tag and uuid_servicename:tag (Docker Compose with build)
// Images pulled by digest have no tag and are not dangling, so they are listed as repo@digest
$grepCommands = "grep -v '<none>'";
// Add application repo exclusion if there are applications
if ($applicationImageRepos->isNotEmpty()) {
$grepCommands .= " | grep -v -E '^({$appExcludePatterns})[_:].+'";
$grepCommands .= " | grep -v -E '^({$appExcludePatterns})[_:@].+'";
}
// Add infrastructure image exclusion (matches any registry prefix)
$grepCommands .= " | grep -v -E '{$infraExcludePattern}'";
$commands[] = "docker images --format '{{.Repository}}:{{.Tag}}' | ".
$commands[] = "docker images --digests --format '{{if eq .Tag \"<none>\"}}{{.Repository}}@{{.Digest}}{{else}}{{.Repository}}:{{.Tag}}{{end}}' | ".
$grepCommands.' | '.
"xargs -r -I {} sh -c 'docker inspect --format \"{{index .Config.Labels \\\"coolify.managed\\\"}}\" \"{}\" 2>/dev/null | grep -q true || docker rmi \"{}\" 2>/dev/null' || true";
tests/Feature/ReverbAndTerminalPackagingTest.php
-1
View File
@@ -254,7 +254,6 @@ it('stops publishing or preserving the obsolete realtime image', function () {
->not->toContain('realtime_version')
->not->toContain('realtime_image')
->and(file_get_contents(app_path('Actions/Server/CleanupDocker.php')))
->not->toContain('coolify-realtime')
->not->toContain('realtimeImage')
->and(file_get_contents(base_path('versions.json')))
->not->toContain('"realtime"')