mirror of
https://github.com/containers/podman.git
synced 2025-12-08 23:00:23 +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/common/libnetwork/pasta/pasta.go
generated
vendored
2
vendor/github.com/containers/common/libnetwork/pasta/pasta.go
generated
vendored
@@ -84,7 +84,7 @@ func Setup(opts *SetupOptions) error {
|
||||
}
|
||||
|
||||
// first append options set in the config
|
||||
cmdArgs = append(cmdArgs, opts.Config.Network.PastaOptions...)
|
||||
cmdArgs = append(cmdArgs, opts.Config.Network.PastaOptions.Get()...)
|
||||
// then append the ones that were set on the cli
|
||||
cmdArgs = append(cmdArgs, opts.ExtraOptions...)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user