mirror of
https://github.com/containers/podman
synced 2024-10-21 01:34:37 +00:00
f7c8dd5836
Cull funcs from runtime_img.go which are no longer needed. Also, fix any remaining spots that use the old image technique. Signed-off-by: baude <bbaude@redhat.com> Closes: #532 Approved by: mheon
46 lines
1.2 KiB
Go
46 lines
1.2 KiB
Go
package libpod
|
|
|
|
import (
|
|
"github.com/containers/storage/pkg/archive"
|
|
"github.com/pkg/errors"
|
|
"github.com/projectatomic/libpod/libpod/layers"
|
|
)
|
|
|
|
// 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)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
fromLayer := ""
|
|
if from != "" {
|
|
fromLayer, err = r.getLayerID(from)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
return r.store.Changes(fromLayer, toLayer)
|
|
}
|
|
|
|
// 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.imageRuntime.NewFromLocal(id)
|
|
if err != nil {
|
|
toCtr, err := r.store.Container(id)
|
|
if err != nil {
|
|
toLayer, err = layers.FullID(r.store, id)
|
|
if err != nil {
|
|
return "", errors.Errorf("layer, image, or container %s does not exist", id)
|
|
}
|
|
} else {
|
|
toLayer = toCtr.LayerID
|
|
}
|
|
} else {
|
|
toLayer = toImage.TopLayer()
|
|
}
|
|
return toLayer, nil
|
|
}
|