Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions common/libnetwork/slirp4netns/slirp4netns.go
Original file line number Diff line number Diff line change
Expand Up @@ -245,13 +245,10 @@ func createBasicSlirpCmdArgs(options *networkOptions, features *slirpFeatures) (
// Setup can be called in rootful as well as in rootless.
// Spawns the slirp4netns process and setup port forwarding if ports are given.
func Setup(opts *SetupOptions) (*SetupResult, error) {
path := opts.Config.Engine.NetworkCmdPath
if path == "" {
var err error
path, err = opts.Config.FindHelperBinary(BinaryName, true)
if err != nil {
return nil, fmt.Errorf("could not find slirp4netns, the network namespace can't be configured: %w", err)
}
var err error
path, err := opts.Config.FindHelperBinary(BinaryName, true)
if err != nil {
return nil, fmt.Errorf("could not find slirp4netns, the network namespace can't be configured: %w", err)
}

syncR, syncW, err := os.Pipe()
Expand Down
3 changes: 0 additions & 3 deletions common/pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -404,9 +404,6 @@ type EngineConfig struct {
// containers and pods will be visible. The default namespace is "".
Namespace string `toml:"namespace,omitempty"`

// 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 attributedstring.Slice `toml:"network_cmd_options,omitempty"`
Expand Down
4 changes: 0 additions & 4 deletions common/pkg/config/containers.conf-freebsd
Original file line number Diff line number Diff line change
Expand Up @@ -503,10 +503,6 @@ default_sysctls = [
#
#namespace = ""

# Path to the slirp4netns binary
#
#network_cmd_path = ""

# Default options to pass to the slirp4netns binary.
# Valid options values are:
#
Expand Down
Loading