From 0cd92eae65b31cdbaa19e3cccb0e3234196a6d17 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Tue, 26 Mar 2019 13:55:19 -0400 Subject: Resolve review comments Signed-off-by: Matthew Heon --- libpod/container.go | 8 ++++---- libpod/container_internal_linux.go | 10 +++++----- libpod/options.go | 20 ++++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) (limited to 'libpod') diff --git a/libpod/container.go b/libpod/container.go index 866cf5c58..806e75c63 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -293,10 +293,10 @@ type ContainerConfig struct { // namespace // These are not used unless CreateNetNS is true PortMappings []ocicni.PortMapping `json:"portMappings,omitempty"` - // NoCreateResolvConf indicates that resolv.conf should not be + // UseImageResolvConf indicates that resolv.conf should not be // bind-mounted inside the container. // Conflicts with DNSServer, DNSSearch, DNSOption. - NoCreateResolvConf bool + UseImageResolvConf bool // DNS servers to use in container resolv.conf // Will override servers in host resolv if set DNSServer []net.IP `json:"dnsServer,omitempty"` @@ -306,10 +306,10 @@ type ContainerConfig struct { // DNS options to be set in container resolv.conf // With override options in host resolv if set DNSOption []string `json:"dnsOption,omitempty"` - // NoCreateHosts indicates that /etc/hosts should not be + // UseImageHosts indicates that /etc/hosts should not be // bind-mounted inside the container. // Conflicts with HostAdd. - NoCreateHosts bool + UseImageHosts bool // Hosts to add in container // Will be appended to host's host file HostAdd []string `json:"hostsAdd,omitempty"` diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 3bb8b23ec..02f8d6aa4 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -703,7 +703,7 @@ func (c *Container) makeBindMounts() error { } } - if c.config.NetNsCtr != "" && (!c.config.NoCreateHosts || !c.config.NoCreateResolvConf) { + if c.config.NetNsCtr != "" && (!c.config.UseImageResolvConf || !c.config.UseImageHosts) { // We share a net namespace. // We want /etc/resolv.conf and /etc/hosts from the // other container. Unless we're not creating both of @@ -719,7 +719,7 @@ func (c *Container) makeBindMounts() error { return errors.Wrapf(err, "error fetching bind mounts from dependency %s of container %s", depCtr.ID(), c.ID()) } - if !c.config.NoCreateResolvConf { + if !c.config.UseImageResolvConf { // The other container may not have a resolv.conf or /etc/hosts // If it doesn't, don't copy them resolvPath, exists := bindMounts["/etc/resolv.conf"] @@ -728,7 +728,7 @@ func (c *Container) makeBindMounts() error { } } - if !c.config.NoCreateHosts { + if !c.config.UseImageHosts { // check if dependency container has an /etc/hosts file hostsPath, exists := bindMounts["/etc/hosts"] if !exists { @@ -751,7 +751,7 @@ func (c *Container) makeBindMounts() error { c.state.BindMounts["/etc/hosts"] = hostsPath } } else { - if !c.config.NoCreateResolvConf { + if !c.config.UseImageResolvConf { newResolv, err := c.generateResolvConf() if err != nil { return errors.Wrapf(err, "error creating resolv.conf for container %s", c.ID()) @@ -759,7 +759,7 @@ func (c *Container) makeBindMounts() error { c.state.BindMounts["/etc/resolv.conf"] = newResolv } - if !c.config.NoCreateHosts { + if !c.config.UseImageHosts { newHosts, err := c.generateHosts("/etc/hosts") if err != nil { return errors.Wrapf(err, "error creating hosts file for container %s", c.ID()) diff --git a/libpod/options.go b/libpod/options.go index a36309ed7..3ca80e96c 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -997,7 +997,7 @@ func WithDNSSearch(searchDomains []string) CtrCreateOption { if ctr.valid { return ErrCtrFinalized } - if ctr.config.NoCreateResolvConf { + if ctr.config.UseImageResolvConf { return errors.Wrapf(ErrInvalidArg, "cannot add DNS search domains if container will not create /etc/resolv.conf") } ctr.config.DNSSearch = searchDomains @@ -1011,7 +1011,7 @@ func WithDNS(dnsServers []string) CtrCreateOption { if ctr.valid { return ErrCtrFinalized } - if ctr.config.NoCreateResolvConf { + if ctr.config.UseImageResolvConf { return errors.Wrapf(ErrInvalidArg, "cannot add DNS servers if container will not create /etc/resolv.conf") } var dns []net.IP @@ -1033,7 +1033,7 @@ func WithDNSOption(dnsOptions []string) CtrCreateOption { if ctr.valid { return ErrCtrFinalized } - if ctr.config.NoCreateResolvConf { + if ctr.config.UseImageResolvConf { return errors.Wrapf(ErrInvalidArg, "cannot add DNS options if container will not create /etc/resolv.conf") } ctr.config.DNSOption = dnsOptions @@ -1048,7 +1048,7 @@ func WithHosts(hosts []string) CtrCreateOption { return ErrCtrFinalized } - if ctr.config.NoCreateHosts { + if ctr.config.UseImageHosts { return errors.Wrapf(ErrInvalidArg, "cannot add hosts if container will not create /etc/hosts") } @@ -1198,9 +1198,9 @@ func WithCtrNamespace(ns string) CtrCreateOption { } } -// WithNoCreateResolvConf tells the container not to bind-mount resolv.conf in. +// WithUseImageResolvConf tells the container not to bind-mount resolv.conf in. // This conflicts with other DNS-related options. -func WithNoCreateResolvConf() CtrCreateOption { +func WithUseImageResolvConf() CtrCreateOption { return func(ctr *Container) error { if ctr.valid { return ErrCtrFinalized @@ -1212,15 +1212,15 @@ func WithNoCreateResolvConf() CtrCreateOption { return errors.Wrapf(ErrInvalidArg, "not creating resolv.conf conflicts with DNS options") } - ctr.config.NoCreateResolvConf = true + ctr.config.UseImageResolvConf = true return nil } } -// WithNoCreateHosts tells the container not to bind-mount /etc/hosts in. +// WithUseImageHosts tells the container not to bind-mount /etc/hosts in. // This conflicts with WithHosts(). -func WithNoCreateHosts() CtrCreateOption { +func WithUseImageHosts() CtrCreateOption { return func(ctr *Container) error { if ctr.valid { return ErrCtrFinalized @@ -1230,7 +1230,7 @@ func WithNoCreateHosts() CtrCreateOption { return errors.Wrapf(ErrInvalidArg, "not creating /etc/hosts conflicts with adding to the hosts file") } - ctr.config.NoCreateHosts = true + ctr.config.UseImageHosts = true return nil } -- cgit v1.2.3-54-g00ecf