github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(app): replace fields removed by Docker 25 and 26 (#11468) 

* fix(app/volume): make optional Container and ContainerConfig fields removed in docker 26

* fix(app/image): use image.Size instead of image.VirtualSize removed in Docker 25
pull/11480/head
LP B 2024-03-29 13:57:14 +01:00 committed by GitHub
parent d336a14e50
commit 2b53bebcb3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/docker/models/image.js
View File

@ -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) {

19
app/docker/models/imageDetails.js
View File

@ -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;
}

2
app/docker/views/dashboard/dashboardController.js
View File

@ -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);
}

2
app/docker/views/images/edit/image.html
View File

@ -130,7 +130,7 @@
</tr>
<tr>
<td>Size</td>
<td>{{ image.VirtualSize | humansize }}</td>
<td>{{ image.Size | humansize }}</td>
</tr>
<tr>
<td>Created</td>

1
app/react/docker/images/types/response.ts
View File

@ -10,6 +10,5 @@ export type DockerImageResponse = {
RepoTags: string[];
SharedSize: number;
Size: number;
VirtualSize: number;
Portainer?: PortainerMetadata;
};