Merge pull request #2585 from giuseppe/build-honor-net

build: honor --net

2 files changed, 32 insertions, 0 deletions

diff --git a/cmd/podman/build.go b/cmd/podman/build.go
index 5fcf03b93..72d78aff9 100644
--- a/cmd/podman/build.go
+++ b/cmd/podman/build.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
@@ -11,6 +12,7 @@ import (
 	"github.com/containers/libpod/cmd/podman/cliconfig"
 	"github.com/containers/libpod/pkg/adapter"
 	"github.com/docker/go-units"
+	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -83,6 +85,26 @@ func getDockerfiles(files []string) []string {
 	return dockerfiles
 }
 
+func getNsValues(c *cliconfig.BuildValues) ([]buildah.NamespaceOption, error) {
+	var ret []buildah.NamespaceOption
+	if c.Network != "" {
+		if c.Network == "host" {
+			ret = append(ret, buildah.NamespaceOption{
+				Name: string(specs.NetworkNamespace),
+				Host: true,
+			})
+		} else if c.Network[0] == '/' {
+			ret = append(ret, buildah.NamespaceOption{
+				Name: string(specs.NetworkNamespace),
+				Path: c.Network,
+			})
+		} else {
+			return nil, fmt.Errorf("unsupported configuration network=%s", c.Network)
+		}
+	}
+	return ret, nil
+}
+
 func buildCmd(c *cliconfig.BuildValues) error {
 	// The following was taken directly from containers/buildah/cmd/bud.go
 	// TODO Find a away to vendor more of this in rather than copy from bud
@@ -227,6 +249,11 @@ func buildCmd(c *cliconfig.BuildValues) error {
 		}
 	}
 
+	nsValues, err := getNsValues(c)
+	if err != nil {
+		return err
+	}
+
 	buildOpts := buildah.CommonBuildOptions{
 		AddHost:      c.AddHost,
 		CgroupParent: c.CgroupParent,
@@ -257,6 +284,7 @@ func buildCmd(c *cliconfig.BuildValues) error {
 		IIDFile:                 c.Iidfile,
 		Labels:                  c.Label,
 		Layers:                  layers,
+		NamespaceOptions:        nsValues,
 		NoCache:                 c.NoCache,
 		Out:                     stdout,
 		Output:                  output,
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index 3f3b22b6b..a7b4aed9f 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -848,6 +848,10 @@ func (c *Container) generateResolvConf() (string, error) {
 
 	// Make a new resolv.conf
 	nameservers := resolvconf.GetNameservers(resolv.Content)
+	// slirp4netns has a built in DNS server.
+	if c.config.NetMode.IsSlirp4netns() {
+		nameservers = append(nameservers, "10.0.2.3")
+	}
 	if len(c.config.DNSServer) > 0 {
 		// We store DNS servers as net.IP, so need to convert to string
 		nameservers = []string{}