mirror of
https://github.com/containers/podman.git
synced 2025-12-04 04:09:40 +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:
2
vendor/github.com/containers/buildah/pkg/parse/parse.go
generated
vendored
2
vendor/github.com/containers/buildah/pkg/parse/parse.go
generated
vendored
@@ -104,6 +104,7 @@ func CommonBuildOptionsFromFlagSet(flags *pflag.FlagSet, findFlagFunc func(name
|
||||
}
|
||||
}
|
||||
|
||||
noHostname, _ := flags.GetBool("no-hostname")
|
||||
noHosts, _ := flags.GetBool("no-hosts")
|
||||
|
||||
addHost, _ := flags.GetStringSlice("add-host")
|
||||
@@ -183,6 +184,7 @@ func CommonBuildOptionsFromFlagSet(flags *pflag.FlagSet, findFlagFunc func(name
|
||||
IdentityLabel: types.NewOptionalBool(identityLabel),
|
||||
Memory: memoryLimit,
|
||||
MemorySwap: memorySwap,
|
||||
NoHostname: noHostname,
|
||||
NoHosts: noHosts,
|
||||
OmitHistory: omitHistory,
|
||||
ShmSize: findFlagFunc("shm-size").Value.String(),
|
||||
|
||||
Reference in New Issue
Block a user