diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-09-25 13:14:20 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@gmail.com> | 2018-10-04 17:34:59 -0400 |
| commit | 52de75501c59baacf3be993253e44e4eaf494b2f (patch) | |
| tree | 006b90a21cb9a5c2360121b623b692d652b4a1db /libpod | |
| parent | bc5fac3a7cbef9c73dd3a739c830066c88fa595f (diff) | |
| download | podman-52de75501c59baacf3be993253e44e4eaf494b2f.tar.gz podman-52de75501c59baacf3be993253e44e4eaf494b2f.tar.bz2 podman-52de75501c59baacf3be993253e44e4eaf494b2f.zip | |
Drop libnetwork vendor and move the code into pkg/
The vendoring issues with libnetwork were significant (it was
dragging in massive amounts of code) and were just not worth
spending the time to work through. Highly unlikely we'll ever end
up needing to update this code, so move it directly into pkg/ so
we don't need to vendor libnetwork. Make a few small changes to
remove the need for the remainder of libnetwork.
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_internal.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 9a2777efc..9f584d2e2 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -15,14 +15,13 @@ import ( "github.com/containers/libpod/pkg/chrootuser" "github.com/containers/libpod/pkg/hooks" "github.com/containers/libpod/pkg/hooks/exec" + "github.com/containers/libpod/pkg/resolvconf" "github.com/containers/libpod/pkg/rootless" "github.com/containers/libpod/pkg/secrets" "github.com/containers/storage" "github.com/containers/storage/pkg/archive" "github.com/containers/storage/pkg/chrootarchive" "github.com/containers/storage/pkg/mount" - "github.com/docker/libnetwork/netutils" - "github.com/docker/libnetwork/resolvconf" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/selinux/go-selinux/label" @@ -1039,7 +1038,7 @@ func (c *Container) generateResolvConf() (string, error) { } // Make a new resolv.conf - nameservers := resolvconf.GetNameservers(resolv.Content, netutils.IP) + nameservers := resolvconf.GetNameservers(resolv.Content) if len(c.config.DNSServer) > 0 { // We store DNS servers as net.IP, so need to convert to string nameservers = []string{} |