diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-05 05:41:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-05 05:41:52 -0500 |
| commit | 0c2a43b99db8a4fd75412a277da6de2731017d3e (patch) | |
| tree | 87f377c23f1e0342600f304d7d266c565d71f497 /vendor | |
| parent | 0be4085596bd42b41d2a807ad0057643b6a3062f (diff) | |
| parent | d6d3af9e8ebda9229a5d92d71c66e416c3f99a91 (diff) | |
| download | podman-0c2a43b99db8a4fd75412a277da6de2731017d3e.tar.gz podman-0c2a43b99db8a4fd75412a277da6de2731017d3e.tar.bz2 podman-0c2a43b99db8a4fd75412a277da6de2731017d3e.zip | |
Merge pull request #8489 from ashley-cui/commonslirp
Add ability to set system wide options for slirp4netns
Diffstat (limited to 'vendor')
4 files changed, 11 insertions, 2 deletions
diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go index 2769781f2..6a44d353a 100644 --- a/vendor/github.com/containers/common/pkg/config/config.go +++ b/vendor/github.com/containers/common/pkg/config/config.go @@ -268,6 +268,10 @@ type EngineConfig struct { // NetworkCmdPath is the path to the slirp4netns binary. NetworkCmdPath string `toml:"network_cmd_path,omitempty"` + // NetworkCmdOptions is the default options to pass to the slirp4netns binary. + // For example "allow_host_loopback=true" + NetworkCmdOptions []string `toml:"network_cmd_options,omitempty"` + // NoPivotRoot sets whether to set no-pivot-root in the OCI runtime. NoPivotRoot bool `toml:"no_pivot_root,omitempty"` diff --git a/vendor/github.com/containers/common/pkg/config/containers.conf b/vendor/github.com/containers/common/pkg/config/containers.conf index ed7c91931..5b5d3f9b6 100644 --- a/vendor/github.com/containers/common/pkg/config/containers.conf +++ b/vendor/github.com/containers/common/pkg/config/containers.conf @@ -348,6 +348,11 @@ default_sysctls = [ # # network_cmd_path="" +# Default options to pass to the slirp4netns binary. +# For example "allow_host_loopback=true" +# +# network_cmd_options=[] + # Whether to use chroot instead of pivot_root in the runtime # # no_pivot_root = false diff --git a/vendor/github.com/containers/common/version/version.go b/vendor/github.com/containers/common/version/version.go index 72f4e00f7..141168961 100644 --- a/vendor/github.com/containers/common/version/version.go +++ b/vendor/github.com/containers/common/version/version.go @@ -1,4 +1,4 @@ package version // Version is the version of the build. -const Version = "0.29.0" +const Version = "0.30.0" diff --git a/vendor/modules.txt b/vendor/modules.txt index 19a87d31d..43c8ebb95 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -86,7 +86,7 @@ github.com/containers/buildah/pkg/parse github.com/containers/buildah/pkg/rusage github.com/containers/buildah/pkg/supplemented github.com/containers/buildah/util -# github.com/containers/common v0.29.0 +# github.com/containers/common v0.30.0 github.com/containers/common/pkg/apparmor github.com/containers/common/pkg/apparmor/internal/supported github.com/containers/common/pkg/auth |