mirror of
https://github.com/containers/podman.git
synced 2025-12-01 02:27:13 +08:00
Bump to Buildah v1.40.0
Bumps to Buildah v1.40.0 and adds the `--inherits-labels` option to build and farm build man pages. Also turn off the inherit-labels option test for now as it seems to be rathr unhappy. Issue for inherit-labels test failure: https://github.com/containers/podman/issues/25938 Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
This commit is contained in:
10
vendor/github.com/containers/buildah/new.go
generated
vendored
10
vendor/github.com/containers/buildah/new.go
generated
vendored
@@ -99,10 +99,8 @@ func newContainerIDMappingOptions(idmapOptions *define.IDMappingOptions) storage
|
||||
|
||||
func containerNameExist(name string, containers []storage.Container) bool {
|
||||
for _, container := range containers {
|
||||
for _, cname := range container.Names {
|
||||
if cname == name {
|
||||
return true
|
||||
}
|
||||
if slices.Contains(container.Names, name) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
@@ -246,11 +244,11 @@ func newBuilder(ctx context.Context, store storage.Store, options BuilderOptions
|
||||
|
||||
suffixDigitsModulo := 100
|
||||
for {
|
||||
var flags map[string]interface{}
|
||||
var flags map[string]any
|
||||
// check if we have predefined ProcessLabel and MountLabel
|
||||
// this could be true if this is another stage in a build
|
||||
if options.ProcessLabel != "" && options.MountLabel != "" {
|
||||
flags = map[string]interface{}{
|
||||
flags = map[string]any{
|
||||
"ProcessLabel": options.ProcessLabel,
|
||||
"MountLabel": options.MountLabel,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user