diff --git a/app/docker/models/image.js b/app/docker/models/image.js index 9b103a1e8..c3febe04c 100644 --- a/app/docker/models/image.js +++ b/app/docker/models/image.js @@ -14,7 +14,7 @@ export function ImageViewModel(data) { } } - this.VirtualSize = data.VirtualSize; + this.Size = data.Size; this.Used = data.Used; if (data.Portainer && data.Portainer.Agent && data.Portainer.Agent.NodeName) { diff --git a/app/docker/models/imageDetails.js b/app/docker/models/imageDetails.js index 50fbdebba..9c02bd8fd 100644 --- a/app/docker/models/imageDetails.js +++ b/app/docker/models/imageDetails.js @@ -6,15 +6,22 @@ export function ImageDetailsViewModel(data) { this.Created = data.Created; this.Checked = false; this.RepoTags = data.RepoTags; - this.VirtualSize = data.VirtualSize; + this.Size = data.Size; this.DockerVersion = data.DockerVersion; this.Os = data.Os; this.Architecture = data.Architecture; this.Author = data.Author; this.Command = data.Config.Cmd; - this.Entrypoint = data.ContainerConfig.Entrypoint ? data.ContainerConfig.Entrypoint : ''; - this.ExposedPorts = data.ContainerConfig.ExposedPorts ? Object.keys(data.ContainerConfig.ExposedPorts) : []; - this.Volumes = data.ContainerConfig.Volumes ? Object.keys(data.ContainerConfig.Volumes) : []; - this.Env = data.ContainerConfig.Env ? data.ContainerConfig.Env : []; - this.Labels = data.ContainerConfig.Labels; + + let config = {}; + if (data.Config) { + config = data.Config; // this is part of OCI images-spec + } else if (data.ContainerConfig != null) { + config = data.ContainerConfig; // not OCI ; has been removed in Docker 26 (API v1.45) along with .Container + } + this.Entrypoint = config.Entrypoint ? config.Entrypoint : ''; + this.ExposedPorts = config.ExposedPorts ? Object.keys(config.ExposedPorts) : []; + this.Volumes = config.Volumes ? Object.keys(config.Volumes) : []; + this.Env = config.Env ? config.Env : []; + this.Labels = config.Labels; } diff --git a/app/docker/views/dashboard/dashboardController.js b/app/docker/views/dashboard/dashboardController.js index d8eb9f64d..893664168 100644 --- a/app/docker/views/dashboard/dashboardController.js +++ b/app/docker/views/dashboard/dashboardController.js @@ -137,5 +137,5 @@ angular.module('portainer.docker').controller('DashboardController', [ ]); function imagesTotalSize(images) { - return images.reduce((acc, image) => acc + image.VirtualSize, 0); + return images.reduce((acc, image) => acc + image.Size, 0); } diff --git a/app/docker/views/images/edit/image.html b/app/docker/views/images/edit/image.html index c37d49139..8e5eac87b 100644 --- a/app/docker/views/images/edit/image.html +++ b/app/docker/views/images/edit/image.html @@ -130,7 +130,7 @@