opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-05 12:52:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

container.conf: support attributed string slices

Browse Source 
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:
Valentin Rothberg
2023-10-25 14:56:03 +02:00
parent 0242a7439e
commit e966c86d98
65 changed files with 10709 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vendor/github.com/containers/common/libnetwork/slirp4netns/slirp4netns.go generated vendored
View File

@@ -124,8 +124,8 @@ func checkSlirpFlags(path string) (*slirpFeatures, error) {
}
func parseNetworkOptions(config *config.Config, extraOptions []string) (*networkOptions, error) {
options := make([]string, 0, len(config.Engine.NetworkCmdOptions)+len(extraOptions))
options = append(options, config.Engine.NetworkCmdOptions...)
options := make([]string, 0, len(config.Engine.NetworkCmdOptions.Get())+len(extraOptions))
options = append(options, config.Engine.NetworkCmdOptions.Get()...)
options = append(options, extraOptions...)
opts := &networkOptions{
// overwrite defaults