mirror of
https://github.com/containers/podman.git
synced 2025-06-12 19:14:36 +08:00
rootfs: Add support for rootfs-overlay and bump to buildah v1.22.1-0.202108
Allows users to specify a readonly rootfs with :O, in exchange podman will create a writable overlay. bump builah to v1.22.1-0.20210823173221-da2b428c56ce [NO TESTS NEEDED] Signed-off-by: flouthoc <flouthoc.git@gmail.com>
This commit is contained in:
8
vendor/github.com/containers/buildah/commit.go
generated
vendored
8
vendor/github.com/containers/buildah/commit.go
generated
vendored
@ -183,6 +183,12 @@ func (b *Builder) addManifest(ctx context.Context, manifestName string, imageSpe
|
||||
create = true
|
||||
list = manifests.Create()
|
||||
} else {
|
||||
locker, err := manifests.LockerForImage(b.store, manifestList.ID())
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
locker.Lock()
|
||||
defer locker.Unlock()
|
||||
_, list, err = manifests.LoadFromImage(b.store, manifestList.ID())
|
||||
if err != nil {
|
||||
return "", err
|
||||
@ -191,7 +197,7 @@ func (b *Builder) addManifest(ctx context.Context, manifestName string, imageSpe
|
||||
|
||||
names, err := util.ExpandNames([]string{manifestName}, systemContext, b.store)
|
||||
if err != nil {
|
||||
return "", errors.Wrapf(err, "error encountered while expanding image name %q", manifestName)
|
||||
return "", errors.Wrapf(err, "error encountered while expanding manifest list name %q", manifestName)
|
||||
}
|
||||
|
||||
ref, err := util.VerifyTagName(imageSpec)
|
||||
|
Reference in New Issue
Block a user