mirror of
https://github.com/containers/podman.git
synced 2025-06-21 17:38:12 +08:00
Merge pull request #20822 from mtrmac/chown-cleanup
Fix transferring data using tar
This commit is contained in:
@ -27,7 +27,6 @@ import (
|
|||||||
"github.com/containers/podman/v4/pkg/domain/infra/abi"
|
"github.com/containers/podman/v4/pkg/domain/infra/abi"
|
||||||
domainUtils "github.com/containers/podman/v4/pkg/domain/utils"
|
domainUtils "github.com/containers/podman/v4/pkg/domain/utils"
|
||||||
"github.com/containers/podman/v4/pkg/errorhandling"
|
"github.com/containers/podman/v4/pkg/errorhandling"
|
||||||
"github.com/containers/podman/v4/pkg/rootless"
|
|
||||||
"github.com/containers/podman/v4/pkg/util"
|
"github.com/containers/podman/v4/pkg/util"
|
||||||
utils2 "github.com/containers/podman/v4/utils"
|
utils2 "github.com/containers/podman/v4/utils"
|
||||||
"github.com/containers/storage"
|
"github.com/containers/storage"
|
||||||
@ -330,10 +329,7 @@ func ExportImages(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
tarOptions := &archive.TarOptions{
|
tarOptions := &archive.TarOptions{
|
||||||
ChownOpts: &idtools.IDPair{
|
ChownOpts: &idtools.IDPair{UID: 0, GID: 0},
|
||||||
UID: rootless.GetRootlessUID(),
|
|
||||||
GID: rootless.GetRootlessGID(),
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
tar, err := chrootarchive.Tar(output, tarOptions, output)
|
tar, err := chrootarchive.Tar(output, tarOptions, output)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -336,7 +336,7 @@ func (ir *ImageEngine) Save(ctx context.Context, nameOrID string, tags []string,
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
return archive.Untar(f, opts.Output, nil)
|
return archive.Untar(f, opts.Output, &archive.TarOptions{NoLchown: true})
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ir *ImageEngine) Search(ctx context.Context, term string, opts entities.ImageSearchOptions) ([]entities.ImageSearchReport, error) {
|
func (ir *ImageEngine) Search(ctx context.Context, term string, opts entities.ImageSearchOptions) ([]entities.ImageSearchReport, error) {
|
||||||
|
Reference in New Issue
Block a user