diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-12 12:19:47 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-12 12:19:47 -0700 |
commit | 1c45b42e9ff972d9645735118635e4186e6411f8 (patch) | |
tree | 4faabdfa704de5bbc9b6b5c14eae20924771dc4f /cmd/podman | |
parent | de0192aac79fa409aa84789348de35f7c3d21a71 (diff) | |
parent | e6139b4824ca6cc3e2c5041121ff43d0cbbcde52 (diff) | |
download | podman-1c45b42e9ff972d9645735118635e4186e6411f8.tar.gz podman-1c45b42e9ff972d9645735118635e4186e6411f8.tar.bz2 podman-1c45b42e9ff972d9645735118635e4186e6411f8.zip |
Merge pull request #2585 from giuseppe/build-honor-net
build: honor --net
Diffstat (limited to 'cmd/podman')
-rw-r--r-- | cmd/podman/build.go | 28 |
1 files changed, 28 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, |