Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: match Docker CLI memory accounting for cgroup v1 containers
Kyle Mendell4c479f1c5b01
diff --git a/backend/go.mod b/backend/go.modindex a788c9c03..a52d84d87 100644--- a/backend/go.mod+++ b/backend/go.mod@@ -67,7 +67,7 @@ require (go.getarcane.app/builds v0.4.0go.getarcane.app/docker/convert v0.3.0go.getarcane.app/kit v0.1.0- go.getarcane.app/streams v0.4.0+ go.getarcane.app/streams v0.4.2go.getarcane.app/sys/cgroup v0.2.0go.getarcane.app/sys/crypto v0.2.0go.getarcane.app/updater v0.8.0diff --git a/backend/go.sum b/backend/go.sumindex 85d253563..e3d34d12c 100644--- a/backend/go.sum+++ b/backend/go.sum@@ -802,8 +802,8 @@ go.getarcane.app/docker/convert v0.3.0 h1:yKsepx7UVQTXccZpMzxoySLrv0kE2qv7p7wfMPgo.getarcane.app/docker/convert v0.3.0/go.mod h1:RtKwdUxye+Ildzzc577qngIfhBeKuOM+XUfV9O1yyyg=go.getarcane.app/kit v0.1.0 h1:82oO/i1fS4xbzAG4Xc8ALOWOwW4kwQYDdBpVHE19QkI=go.getarcane.app/kit v0.1.0/go.mod h1:oiH4hLowxfQYFtmldyk/y79XYBHYfzgd86MrSQS9UEg=-go.getarcane.app/streams v0.4.0 h1:MtBX1SVgt3nrcRNr5SYAvckGp9a5qeSjMTw/LAGwlzk=-go.getarcane.app/streams v0.4.0/go.mod h1:LHMKblQvsL1nqKh/Y+KgQbwFSMI2I7bs9u8ZwZqzjnQ=+go.getarcane.app/streams v0.4.2 h1:+xrRHiOt25cLbFTDpPLzv7eFkk7biwDz5YjBXkbWUPw=+go.getarcane.app/streams v0.4.2/go.mod h1:wwQ5HIYYBZzktUNmSI3Q/VJ6A6KgGiYWk5q/UzID+oY=go.getarcane.app/sys/cgroup v0.2.0 h1:JGkz23FoNNgLjq0y4k2uUPtKhlh4StpnmS4STyICq6E=go.getarcane.app/sys/cgroup v0.2.0/go.mod h1:y+FJhJrzEjzATNmVDPZCNrtzkPy4FXKvN1V0BSxi20M=go.getarcane.app/sys/crypto v0.2.0 h1:qX1WjxMRRtoeKDK07sfhqEQh79VtUnAWfp82ukkDo9k=diff --git a/frontend/src/lib/types/docker.ts b/frontend/src/lib/types/docker.tsindex f63afe190..964021c48 100644--- a/frontend/src/lib/types/docker.ts+++ b/frontend/src/lib/types/docker.ts@@ -369,6 +369,7 @@ export interface MemoryStats {file_writeback?: number;inactive_anon?: number;inactive_file?: number;+ total_inactive_file?: number;kernel_stack?: number;pgactivate?: number;pgdeactivate?: number;diff --git a/frontend/src/lib/utils/docker.ts b/frontend/src/lib/utils/docker.tsindex 64433e4d3..5f2644916 100644--- a/frontend/src/lib/utils/docker.ts+++ b/frontend/src/lib/utils/docker.ts@@ -49,8 +49,15 @@ export function calculateMemoryUsage(stats: ContainerStats | null): number {if (!stats?.memory_stats) return 0;const usage = stats.memory_stats.usage || 0;- const inactiveFile = stats.memory_stats.stats?.inactive_file || 0;- return Math.max(usage - inactiveFile, 0);+ const totalInactiveFile = stats.memory_stats.stats?.total_inactive_file;+ if (totalInactiveFile !== undefined && totalInactiveFile < usage) {+ return usage - totalInactiveFile;+ }+ const inactiveFile = stats.memory_stats.stats?.inactive_file;+ if (inactiveFile !== undefined && inactiveFile < usage) {+ return usage - inactiveFile;+ }+ return usage;}export function getContainerIpAddresses(container: ContainerSummaryDto): string[] {@@ -191,7 +198,7 @@ export function ensureUpdatesFilter<T extends SearchPaginationSortRequest>(optioreturn {...options,filters: {- ...(options.filters ?? {}),+ ...options.filters,updates: updatesFilter}};@@ -202,7 +209,7 @@ export function ensureStandaloneContainerUpdatesFilter<T extends SearchPaginatioreturn {...next,filters: {- ...(next.filters ?? {}),+ ...next.filters,standalone: true}};