summaryrefslogtreecommitdiff
path: root/libpod/container_internal_linux.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-06-15 09:19:40 -0400
committerGitHub <noreply@github.com>2020-06-15 09:19:40 -0400
commitf4c3b718eb22a161a897a6ed55d10f3a07e31aa8 (patch)
treebb453d40a50f8cef1ebfedc73e43e2c7fe7d3456 /libpod/container_internal_linux.go
parente94e3fd2e829fd2cd38428aa9d9bf68b37bb8407 (diff)
parent200cfa41a434b7143620c2c252b3eb7ab3ef92f9 (diff)
downloadpodman-f4c3b718eb22a161a897a6ed55d10f3a07e31aa8.tar.gz
podman-f4c3b718eb22a161a897a6ed55d10f3a07e31aa8.tar.bz2
podman-f4c3b718eb22a161a897a6ed55d10f3a07e31aa8.zip
Merge pull request #6557 from rhatdan/lint
Turn on More linters
Diffstat (limited to 'libpod/container_internal_linux.go')
-rw-r--r--libpod/container_internal_linux.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index 9afe11b2b..12c1abf1c 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -1313,7 +1313,7 @@ func (c *Container) generateResolvConf() (string, error) {
}
}
- var dns []net.IP
+ dns := make([]net.IP, 0, len(c.runtime.config.Containers.DNSServers))
for _, i := range c.runtime.config.Containers.DNSServers {
result := net.ParseIP(i)
if result == nil {
@@ -1393,7 +1393,9 @@ func (c *Container) generateHosts(path string) (string, error) {
// local hosts file. netCtr is the container from which the netNS information is
// taken.
// path is the basis of the hosts file, into which netCtr's netNS information will be appended.
-func (c *Container) appendHosts(path string, netCtr *Container) (string, error) {
+// FIXME. Path should be used by this function,but I am not sure what is correct; remove //lint
+// once this is fixed
+func (c *Container) appendHosts(path string, netCtr *Container) (string, error) { //nolint
return c.appendStringToRundir("hosts", netCtr.getHosts())
}