Skip to content

Commit 9657cd6

Browse files
bauderh-atomic-bot
authored andcommitted
Fix varlink remove image force
Fixes a bug where the force bool was being ignored when deleting images via the varlink interface. Also, minor fix to the docs to add a line break between methods and types in the doc index. Signed-off-by: baude <[email protected]> Closes: #753 Approved by: rhatdan
1 parent c339c5b commit 9657cd6

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

API.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ in the [API.md](https://github.com/projectatomic/libpod/blob/master/API.md) file
8080
[func UpdateContainer() NotImplemented](#UpdateContainer)
8181

8282
[func WaitContainer(name: string) int](#WaitContainer)
83+
8384
[type ContainerChanges](#ContainerChanges)
8485

8586
[type ContainerMount](#ContainerMount)

docs/varlink/apidoc.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ func generateIndex(methods []funcDescriber, types []typeDescriber, errors []err,
184184
}
185185
b.WriteString(fmt.Sprintf("\n[func %s(%s) %s](#%s)\n", method.Name, strings.Join(inArgs, ", "), strings.Join(outArgs, ", "), method.Name))
186186
}
187+
b.WriteString("\n")
187188
for _, t := range types {
188189
b.WriteString(fmt.Sprintf("[type %s](#%s)\n\n", t.Name, t.Name))
189190
}

pkg/varlinkapi/images.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,11 @@ func (i *LibpodAPI) RemoveImage(call ioprojectatomicpodman.VarlinkCall, name str
170170
if err != nil {
171171
return call.ReplyImageNotFound(name)
172172
}
173-
if err := newImage.Remove(force); err != nil {
173+
imageID, err := runtime.RemoveImage(newImage, force)
174+
if err != nil {
174175
return call.ReplyErrorOccurred(err.Error())
175176
}
176-
return call.ReplyRemoveImage(newImage.ID())
177+
return call.ReplyRemoveImage(imageID)
177178
}
178179

179180
// SearchImage searches all registries configured in /etc/containers/registries.conf for an image

0 commit comments

Comments
 (0)