opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-17 23:26:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

podman diff accept two images or containers

Browse Source 
First, make podman diff accept optionally a second argument. This allows
the user to specify a second image/container to compare the first with.
If it is not set the parent layer will be used as before.

Second, podman container diff should only use containers and podman
image diff should only use images. Previously, podman container diff
would use the image when both an image and container with this name
exists.

To make this work two new parameters have been added to the api. If they
are not used the previous behaviour is used. The same applies to the
bindings.

Fixes #10649

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2021-07-01 15:24:20 +02:00
parent fd1715568b
commit 8f6a0243f4
28 changed files with 513 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
libpod/diff.go
View File

@ -2,6 +2,7 @@ package libpod
import (
"github.com/containers/common/libimage"
"github.com/containers/podman/v3/libpod/define"
"github.com/containers/podman/v3/libpod/layers"
"github.com/containers/storage/pkg/archive"
"github.com/pkg/errors"
@ -21,14 +22,14 @@ var initInodes = map[string]bool{
}
// GetDiff returns the differences between the two images, layers, or containers
func (r *Runtime) GetDiff(from, to string) ([]archive.Change, error) {
toLayer, err := r.getLayerID(to)
func (r *Runtime) GetDiff(from, to string, diffType define.DiffType) ([]archive.Change, error) {
toLayer, err := r.getLayerID(to, diffType)
if err != nil {
return nil, err
}
fromLayer := ""
if from != "" {
fromLayer, err = r.getLayerID(from)
fromLayer, err = r.getLayerID(from, diffType)
if err != nil {
return nil, err
}
@ -49,25 +50,30 @@ func (r *Runtime) GetDiff(from, to string) ([]archive.Change, error) {
// GetLayerID gets a full layer id given a full or partial id
// If the id matches a container or image, the id of the top layer is returned
// If the id matches a layer, the top layer id is returned
func (r *Runtime) getLayerID(id string) (string, error) {
var toLayer string
toImage, _, err := r.libimageRuntime.LookupImage(id, &libimage.LookupImageOptions{IgnorePlatform: true})
if err == nil {
return toImage.TopLayer(), nil
func (r *Runtime) getLayerID(id string, diffType define.DiffType) (string, error) {
var lastErr error
if diffType&define.DiffImage == define.DiffImage {
toImage, _, err := r.libimageRuntime.LookupImage(id, &libimage.LookupImageOptions{IgnorePlatform: true})
if err == nil {
return toImage.TopLayer(), nil
}
lastErr = err
}
targetID, err := r.store.Lookup(id)
if err != nil {
targetID = id
}
toCtr, err := r.store.Container(targetID)
if err != nil {
toLayer, err = layers.FullID(r.store, targetID)
if err != nil {
return "", errors.Errorf("layer, image, or container %s does not exist", id)
if diffType&define.DiffContainer == define.DiffContainer {
toCtr, err := r.store.Container(id)
if err == nil {
return toCtr.LayerID, nil
}
} else {
toLayer = toCtr.LayerID
lastErr = err
}
return toLayer, nil
if diffType == define.DiffAll {
toLayer, err := layers.FullID(r.store, id)
if err == nil {
return toLayer, nil
}
lastErr = err
}
return "", errors.Wrapf(lastErr, "%s not found", id)
}