mirror of
https://github.com/containers/podman.git
synced 2025-12-10 15:47:46 +08:00
container.conf: support attributed string slices
All `[]string`s in containers.conf have now been migrated to attributed string slices which require some adjustments in Buildah and Podman. [NO NEW TESTS NEEDED] Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
This commit is contained in:
4
vendor/github.com/containers/common/pkg/config/config_local.go
generated
vendored
4
vendor/github.com/containers/common/pkg/config/config_local.go
generated
vendored
@@ -31,7 +31,7 @@ func (c *EngineConfig) validatePaths() error {
|
||||
}
|
||||
|
||||
func (c *ContainersConfig) validateDevices() error {
|
||||
for _, d := range c.Devices {
|
||||
for _, d := range c.Devices.Get() {
|
||||
if parser.IsQualifiedName(d) {
|
||||
continue
|
||||
}
|
||||
@@ -44,7 +44,7 @@ func (c *ContainersConfig) validateDevices() error {
|
||||
}
|
||||
|
||||
func (c *ContainersConfig) validateUlimits() error {
|
||||
for _, u := range c.DefaultUlimits {
|
||||
for _, u := range c.DefaultUlimits.Get() {
|
||||
ul, err := units.ParseUlimit(u)
|
||||
if err != nil {
|
||||
return fmt.Errorf("unrecognized ulimit %s: %w", u, err)
|
||||
|
||||
Reference in New Issue
Block a user