From 9f5b17cce553a2860ba0ec60fea6ee59a8ecd1f8 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Wed, 14 Jun 2023 15:39:56 +0200 Subject: [PATCH] libnetwork/pasta: use options from containers.conf Read pasta_options from containers.conf and set the arguments based on that. The options that were set on the cli will appended after that so it allows some form of overwrites. Signed-off-by: Paul Holzinger --- common/libnetwork/pasta/pasta.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/libnetwork/pasta/pasta.go b/common/libnetwork/pasta/pasta.go index 262569e902..ef6f54f115 100644 --- a/common/libnetwork/pasta/pasta.go +++ b/common/libnetwork/pasta/pasta.go @@ -83,6 +83,9 @@ func Setup(opts *SetupOptions) error { } } + // first append options set in the config + cmdArgs = append(cmdArgs, opts.Config.Network.PastaOptions...) + // then append the ones that were set on the cli cmdArgs = append(cmdArgs, opts.ExtraOptions...) for i, opt := range cmdArgs {