mirror of
https://github.com/containers/podman.git
synced 2025-06-24 03:08:13 +08:00
Merge pull request #10056 from mheon/misc_cleanup
[NO TESTS NEEDED] Make an advanced layer diff function private
This commit is contained in:
@ -1,8 +1,6 @@
|
||||
package libpod
|
||||
|
||||
import (
|
||||
"io"
|
||||
|
||||
"github.com/containers/podman/v3/libpod/layers"
|
||||
"github.com/containers/storage/pkg/archive"
|
||||
"github.com/pkg/errors"
|
||||
@ -46,16 +44,6 @@ func (r *Runtime) GetDiff(from, to string) ([]archive.Change, error) {
|
||||
return rchanges, err
|
||||
}
|
||||
|
||||
// ApplyDiffTarStream applies the changes stored in 'diff' to the layer 'to'
|
||||
func (r *Runtime) ApplyDiffTarStream(to string, diff io.Reader) error {
|
||||
toLayer, err := r.getLayerID(to)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = r.store.ApplyDiff(toLayer, diff)
|
||||
return err
|
||||
}
|
||||
|
||||
// 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
|
||||
|
Reference in New Issue
Block a user