mirror of
https://github.com/containers/podman.git
synced 2025-12-01 18:49:18 +08:00
bump buildah to latest
Also includes a small change to make us of https://github.com/containers/buildah/pull/5039 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
14
vendor/github.com/containers/buildah/buildah.go
generated
vendored
14
vendor/github.com/containers/buildah/buildah.go
generated
vendored
@@ -386,6 +386,11 @@ type ImportFromImageOptions struct {
|
||||
SystemContext *types.SystemContext
|
||||
}
|
||||
|
||||
// ConfidentialWorkloadOptions encapsulates options which control whether or not
|
||||
// we output an image whose rootfs contains a LUKS-compatibly-encrypted disk image
|
||||
// instead of the usual rootfs contents.
|
||||
type ConfidentialWorkloadOptions = define.ConfidentialWorkloadOptions
|
||||
|
||||
// NewBuilder creates a new build container.
|
||||
func NewBuilder(ctx context.Context, store storage.Store, options BuilderOptions) (*Builder, error) {
|
||||
if options.CommonBuildOpts == nil {
|
||||
@@ -433,6 +438,9 @@ func OpenBuilder(store storage.Store, container string) (*Builder, error) {
|
||||
b.store = store
|
||||
b.fixupConfig(nil)
|
||||
b.setupLogger()
|
||||
if b.CommonBuildOpts == nil {
|
||||
b.CommonBuildOpts = &CommonBuildOptions{}
|
||||
}
|
||||
return b, nil
|
||||
}
|
||||
|
||||
@@ -469,6 +477,9 @@ func OpenBuilderByPath(store storage.Store, path string) (*Builder, error) {
|
||||
b.store = store
|
||||
b.fixupConfig(nil)
|
||||
b.setupLogger()
|
||||
if b.CommonBuildOpts == nil {
|
||||
b.CommonBuildOpts = &CommonBuildOptions{}
|
||||
}
|
||||
return b, nil
|
||||
}
|
||||
if err != nil {
|
||||
@@ -506,6 +517,9 @@ func OpenAllBuilders(store storage.Store) (builders []*Builder, err error) {
|
||||
b.store = store
|
||||
b.setupLogger()
|
||||
b.fixupConfig(nil)
|
||||
if b.CommonBuildOpts == nil {
|
||||
b.CommonBuildOpts = &CommonBuildOptions{}
|
||||
}
|
||||
builders = append(builders, b)
|
||||
continue
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user