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
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
|
This patch reverts commit e308ba0215baa95be5e177533adc1e15029e0869
Author: Miloslav Trmač <mitr@redhat.com>
Date: Wed Jan 25 19:22:41 2023 +0100
Vendor c/image after https://github.com/containers/image/pull/1816
Also includes unreleased https://github.com/openshift/imagebuilder/pull/246 to work
with the updated docker/docker dependency.
And updates some references to newly deprecated docker/docker symbols.
[NO NEW TESTS NEEDED]
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Index: libpod/pkg/api/handlers/compat/system.go
===================================================================
--- libpod.orig/pkg/api/handlers/compat/system.go
+++ libpod/pkg/api/handlers/compat/system.go
@@ -11,7 +11,6 @@ import (
"github.com/containers/podman/v4/pkg/domain/entities"
"github.com/containers/podman/v4/pkg/domain/infra/abi"
docker "github.com/docker/docker/api/types"
- "github.com/docker/docker/api/types/volume"
)
func GetDiskUsage(w http.ResponseWriter, r *http.Request) {
@@ -65,9 +64,9 @@ func GetDiskUsage(w http.ResponseWriter,
ctnrs[i] = &t
}
- vols := make([]*volume.Volume, len(df.Volumes))
+ vols := make([]*docker.Volume, len(df.Volumes))
for i, o := range df.Volumes {
- t := volume.Volume{
+ t := docker.Volume{
CreatedAt: "",
Driver: "",
Labels: map[string]string{},
@@ -76,7 +75,7 @@ func GetDiskUsage(w http.ResponseWriter,
Options: nil,
Scope: "local",
Status: nil,
- UsageData: &volume.UsageData{
+ UsageData: &docker.VolumeUsageData{
RefCount: int64(o.Links),
Size: o.Size,
},
Index: libpod/pkg/api/handlers/compat/volumes.go
===================================================================
--- libpod.orig/pkg/api/handlers/compat/volumes.go
+++ libpod/pkg/api/handlers/compat/volumes.go
@@ -55,14 +55,14 @@ func ListVolumes(w http.ResponseWriter,
utils.InternalServerError(w, err)
return
}
- volumeConfigs := make([]*docker_api_types_volume.Volume, 0, len(vols))
+ volumeConfigs := make([]*docker_api_types.Volume, 0, len(vols))
for _, v := range vols {
mp, err := v.MountPoint()
if err != nil {
utils.InternalServerError(w, err)
return
}
- config := docker_api_types_volume.Volume{
+ config := docker_api_types.Volume{
Name: v.Name(),
Driver: v.Driver(),
Mountpoint: mp,
@@ -73,7 +73,7 @@ func ListVolumes(w http.ResponseWriter,
}
volumeConfigs = append(volumeConfigs, &config)
}
- response := docker_api_types_volume.ListResponse{
+ response := docker_api_types_volume.VolumeListOKBody{
Volumes: volumeConfigs,
Warnings: []string{},
}
@@ -94,7 +94,7 @@ func CreateVolume(w http.ResponseWriter,
return
}
// decode params from body
- input := docker_api_types_volume.CreateOptions{}
+ input := docker_api_types_volume.VolumeCreateBody{}
if err := json.NewDecoder(r.Body).Decode(&input); err != nil {
utils.Error(w, http.StatusInternalServerError, fmt.Errorf("Decode(): %w", err))
return
@@ -121,7 +121,7 @@ func CreateVolume(w http.ResponseWriter,
utils.InternalServerError(w, err)
return
}
- response := docker_api_types_volume.Volume{
+ response := docker_api_types.Volume{
CreatedAt: existingVolume.CreatedTime().Format(time.RFC3339),
Driver: existingVolume.Driver(),
Labels: existingVolume.Labels(),
@@ -166,7 +166,7 @@ func CreateVolume(w http.ResponseWriter,
utils.InternalServerError(w, err)
return
}
- volResponse := docker_api_types_volume.Volume{
+ volResponse := docker_api_types.Volume{
Name: config.Name,
Driver: config.Driver,
Mountpoint: mp,
@@ -196,7 +196,7 @@ func InspectVolume(w http.ResponseWriter
utils.InternalServerError(w, err)
return
}
- volResponse := docker_api_types_volume.Volume{
+ volResponse := docker_api_types.Volume{
Name: vol.Name(),
Driver: vol.Driver(),
Mountpoint: mp,
Index: libpod/pkg/api/handlers/swagger/responses.go
===================================================================
--- libpod.orig/pkg/api/handlers/swagger/responses.go
+++ libpod/pkg/api/handlers/swagger/responses.go
@@ -240,7 +240,7 @@ type containersList struct {
// swagger:response
type volumeInspect struct {
// in:body
- Body dockerVolume.Volume
+ Body dockerAPI.Volume
}
// Volume prune
@@ -254,7 +254,7 @@ type volumePruneResponse struct {
// swagger:response
type volumeList struct {
// in:body
- Body dockerVolume.ListResponse
+ Body dockerVolume.VolumeListOKBody
}
// Volume list
Index: libpod/test/apiv2/45-system.at
===================================================================
--- libpod.orig/test/apiv2/45-system.at
+++ libpod/test/apiv2/45-system.at
@@ -7,7 +7,7 @@
t POST 'libpod/system/prune?volumes=true&all=true' params='' 200
## podman system df
-t GET system/df 200 '{"LayersSize":0,"Images":[],"Containers":[],"Volumes":[],"BuildCache":[]}'
+t GET system/df 200 '{"LayersSize":0,"Images":[],"Containers":[],"Volumes":[],"BuildCache":[],"BuilderSize":0}'
t GET libpod/system/df 200 '{"ImagesSize":0,"Images":[],"Containers":[],"Volumes":[]}'
# Create volume. We expect df to report this volume next invocation of system/df
|
