1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
|
From: Reinhard Tartler <siretart@tauware.de>
Date: Mon, 20 Oct 2025 06:01:07 -0400
Subject: Revert "vendor: update docker v28 and c/{common,image}"
This reverts commit 91a08235d11d6d3c4cd2d3b1c6a92c96f2415e80.
---
pkg/api/handlers/compat/containers.go | 1 +
pkg/api/handlers/compat/images_prune.go | 2 +-
pkg/api/handlers/compat/volumes.go | 2 +-
pkg/api/handlers/types.go | 12 +++++-------
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go
index a6582a9..de35440 100644
--- a/pkg/api/handlers/compat/containers.go
+++ b/pkg/api/handlers/compat/containers.go
@@ -529,6 +529,7 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*types.ContainerJSON,
HostnamePath: inspect.HostnamePath,
HostsPath: inspect.HostsPath,
LogPath: l.LogPath(),
+ Node: nil,
Name: fmt.Sprintf("/%s", l.Name()),
RestartCount: int(inspect.RestartCount),
Driver: inspect.Driver,
diff --git a/pkg/api/handlers/compat/images_prune.go b/pkg/api/handlers/compat/images_prune.go
index 282fa1b..35dbe29 100644
--- a/pkg/api/handlers/compat/images_prune.go
+++ b/pkg/api/handlers/compat/images_prune.go
@@ -66,7 +66,7 @@ func PruneImages(w http.ResponseWriter, r *http.Request) {
}
payload := handlers.ImagesPruneReport{
- PruneReport: dockerImage.PruneReport{
+ ImagesPruneReport: dockerImage.PruneReport{
ImagesDeleted: idr,
SpaceReclaimed: reclaimedSpace,
},
diff --git a/pkg/api/handlers/compat/volumes.go b/pkg/api/handlers/compat/volumes.go
index 46756a4..9ddda58 100644
--- a/pkg/api/handlers/compat/volumes.go
+++ b/pkg/api/handlers/compat/volumes.go
@@ -311,7 +311,7 @@ func PruneVolumes(w http.ResponseWriter, r *http.Request) {
}
payload := handlers.VolumesPruneReport{
- PruneReport: volume.PruneReport{
+ VolumesPruneReport: volume.PruneReport{
VolumesDeleted: prunedIds,
SpaceReclaimed: reclaimedSpace,
},
diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go
index e2fb642..2c0aafe 100644
--- a/pkg/api/handlers/types.go
+++ b/pkg/api/handlers/types.go
@@ -6,11 +6,9 @@ import (
docker "github.com/docker/docker/api/types"
dockerBackend "github.com/docker/docker/api/types/backend"
dockerContainer "github.com/docker/docker/api/types/container"
- dockerImage "github.com/docker/docker/api/types/image"
dockerNetwork "github.com/docker/docker/api/types/network"
"github.com/docker/docker/api/types/registry"
"github.com/docker/docker/api/types/system"
- "github.com/docker/docker/api/types/volume"
"github.com/opencontainers/runtime-spec/specs-go"
)
@@ -52,7 +50,7 @@ type LibpodImagesResolveReport struct {
}
type ContainersPruneReport struct {
- dockerContainer.PruneReport
+ docker.ContainersPruneReport
}
type ContainersPruneReportLibpod struct {
@@ -110,11 +108,11 @@ type DiskUsage struct {
}
type VolumesPruneReport struct {
- volume.PruneReport
+ docker.VolumesPruneReport
}
type ImagesPruneReport struct {
- dockerImage.PruneReport
+ docker.ImagesPruneReport
}
type BuildCachePruneReport struct {
@@ -122,7 +120,7 @@ type BuildCachePruneReport struct {
}
type NetworkPruneReport struct {
- dockerNetwork.PruneReport
+ docker.NetworksPruneReport
}
type ConfigCreateResponse struct {
@@ -175,7 +173,7 @@ type HistoryResponse struct {
}
type ExecCreateConfig struct {
- dockerContainer.ExecOptions
+ docker.ExecConfig
}
type ExecStartConfig struct {
|
