philipp/uncloud
1
0
Fork 0
mirror of https://github.com/psviderski/uncloud.git synced 2026-08-26 11:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(images): simplifies ListImages service, server, and client to only list Docker images and not directly access containerd

Browse Source
This commit is contained in:
Pasha Sviderski
2025-10-03 18:25:39 +10:00
parent f8bf6bccd3
commit cce81ecaad
10 changed files with 234 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/client/image.go
+5 -10
View File
@@ -42,7 +42,8 @@ func (cli *Client) InspectRemoteImage(ctx context.Context, id string) ([]api.Mac
return cli.Docker.InspectRemoteImage(ctx, id)
}
// ListImages returns a list of images in Docker and containerd on specified machines in the cluster.
// ListImages returns a list of images on specified machines in the cluster. If no machines are specified in the filter,
// it lists images on all machines.
func (cli *Client) ListImages(ctx context.Context, filter api.ImageFilter) ([]api.MachineImages, error) {
// Broadcast the image list request to the specified machines or all machines if none specified.
listCtx, machines, err := api.ProxyMachinesContext(ctx, cli, filter.Machines)
@@ -75,15 +76,9 @@ func (cli *Client) ListImages(ctx context.Context, filter api.ImageFilter) ([]ap
}
}
if len(msg.DockerImages) > 0 {
if err = json.Unmarshal(msg.DockerImages, &machineImages[i].DockerImages); err != nil {
return nil, fmt.Errorf("unmarshal Docker images: %w", err)
}
}
if len(msg.ContainerdImages) > 0 {
if err = json.Unmarshal(msg.ContainerdImages, &machineImages[i].ContainerdImages); err != nil {
return nil, fmt.Errorf("unmarshal containerd images: %w", err)
if len(msg.Images) > 0 {
if err = json.Unmarshal(msg.Images, &machineImages[i].Images); err != nil {
return nil, fmt.Errorf("unmarshal images: %w", err)
}
}
}