mirror of
https://github.com/containers/podman.git
synced 2025-12-04 04:09:40 +08:00
Bump Buidah to v1.42.0 for Podman v5.7
Vendor Buildah v1.42.0 into Podman for v5.7.0. This will also drag in: go.podman.io/common v0.66.0 go.podman.io/image v5.38.0 go.podman.io/storage v1.61.0 Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
This commit is contained in:
9
vendor/github.com/containers/buildah/internal/config/override.go
generated
vendored
9
vendor/github.com/containers/buildah/internal/config/override.go
generated
vendored
@@ -2,6 +2,7 @@ package config
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"maps"
|
||||
"os"
|
||||
"slices"
|
||||
"strings"
|
||||
@@ -136,9 +137,7 @@ func OverrideOCI(oconfig *v1.ImageConfig, overrideChanges []string, overrideConf
|
||||
if oconfig.Labels == nil {
|
||||
oconfig.Labels = make(map[string]string)
|
||||
}
|
||||
for k, v := range overrideConfig.Labels {
|
||||
oconfig.Labels[k] = v
|
||||
}
|
||||
maps.Copy(oconfig.Labels, overrideConfig.Labels)
|
||||
}
|
||||
oconfig.StopSignal = overrideConfig.StopSignal
|
||||
}
|
||||
@@ -206,9 +205,7 @@ func OverrideDocker(dconfig *docker.Config, overrideChanges []string, overrideCo
|
||||
if dconfig.Labels == nil {
|
||||
dconfig.Labels = make(map[string]string)
|
||||
}
|
||||
for k, v := range overrideConfig.Labels {
|
||||
dconfig.Labels[k] = v
|
||||
}
|
||||
maps.Copy(dconfig.Labels, overrideConfig.Labels)
|
||||
}
|
||||
dconfig.StopSignal = overrideConfig.StopSignal
|
||||
dconfig.StopTimeout = overrideConfig.StopTimeout
|
||||
|
||||
Reference in New Issue
Block a user