Add hostname specifying for building

Fix: #1301 Signed-off-by: l00397676 <lujingxiao@huawei.com>
moby · Jan 22, 2020 · f594804 · f594804
1 parent 8a26782
commit f594804
Show file tree

Hide file tree

Showing 12 changed files with 258 additions and 169 deletions.
diff --git a/client/llb/exec.go b/client/llb/exec.go
@@ -17,6 +17,7 @@ type Meta struct {
 	Env        EnvList
 	Cwd        string
 	User       string
+	Hostname   string
 	ProxyEnv   *ProxyEnv
 	ExtraHosts []HostIP
 	Network    pb.NetMode
@@ -155,10 +156,11 @@ func (e *ExecOp) Marshal(c *Constraints) (digest.Digest, []byte, *pb.OpMetadata,
 	}
 
 	meta := &pb.Meta{
-		Args: e.meta.Args,
-		Env:  e.meta.Env.ToArray(),
-		Cwd:  e.meta.Cwd,
-		User: e.meta.User,
+		Args:     e.meta.Args,
+		Env:      e.meta.Env.ToArray(),
+		Cwd:      e.meta.Cwd,
+		User:     e.meta.User,
+		Hostname: e.meta.Hostname,
 	}
 	if len(e.meta.ExtraHosts) > 0 {
 		hosts := make([]*pb.HostIP, len(e.meta.ExtraHosts))

diff --git a/client/llb/meta.go b/client/llb/meta.go
@@ -18,6 +18,7 @@ var (
 	keyDir       = contextKeyT("llb.exec.dir")
 	keyEnv       = contextKeyT("llb.exec.env")
 	keyUser      = contextKeyT("llb.exec.user")
+	keyHostname  = contextKeyT("llb.exec.hostname")
 	keyExtraHost = contextKeyT("llb.exec.extrahost")
 	keyPlatform  = contextKeyT("llb.platform")
 	keyNetwork   = contextKeyT("llb.network")
@@ -99,6 +100,20 @@ func getUser(s State) string {
 	return ""
 }
 
+func hostname(str string) StateOption {
+	return func(s State) State {
+		return s.WithValue(keyHostname, str)
+	}
+}
+
+func getHostname(s State) string {
+	v := s.Value(keyHostname)
+	if v != nil {
+		return v.(string)
+	}
+	return ""
+}
+
 func args(args ...string) StateOption {
 	return func(s State) State {
 		return s.WithValue(keyArgs, args)

diff --git a/client/llb/state.go b/client/llb/state.go
@@ -211,6 +211,7 @@ func (s State) Run(ro ...RunOption) ExecState {
 		Cwd:        getDir(ei.State),
 		Env:        getEnv(ei.State),
 		User:       getUser(ei.State),
+		Hostname:   getHostname(ei.State),
 		ProxyEnv:   ei.ProxyEnv,
 		ExtraHosts: getExtraHosts(ei.State),
 		Network:    getNetwork(ei.State),
@@ -278,6 +279,14 @@ func (s State) User(v string) State {
 	return user(v)(s)
 }
 
+func (s State) Hostname(v string) State {
+	return hostname(v)(s)
+}
+
+func (s State) GetHostname() string {
+	return getHostname(s)
+}
+
 func (s State) Platform(p specs.Platform) State {
 	return platform(p)(s)
 }

diff --git a/executor/containerdexecutor/executor.go b/executor/containerdexecutor/executor.go
@@ -56,7 +56,7 @@ func (w containerdExecutor) Exec(ctx context.Context, meta executor.Meta, root c
 		return err
 	}
 
-	hostsFile, clean, err := oci.GetHostsFile(ctx, w.root, meta.ExtraHosts, nil)
+	hostsFile, clean, err := oci.GetHostsFile(ctx, w.root, meta.ExtraHosts, nil, meta.Hostname)
 	if err != nil {
 		return err
 	}

diff --git a/executor/executor.go b/executor/executor.go
@@ -14,6 +14,7 @@ type Meta struct {
 	Env            []string
 	User           string
 	Cwd            string
+	Hostname       string
 	Tty            bool
 	ReadonlyRootFS bool
 	ExtraHosts     []HostIP

diff --git a/executor/oci/hosts.go b/executor/oci/hosts.go
@@ -7,6 +7,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/docker/docker/pkg/idtools"
 	"github.com/moby/buildkit/executor"
@@ -18,21 +19,21 @@ const hostsContent = `
 ::1	localhost ip6-localhost ip6-loopback
 `
 
-func GetHostsFile(ctx context.Context, stateDir string, extraHosts []executor.HostIP, idmap *idtools.IdentityMapping) (string, func(), error) {
+func GetHostsFile(ctx context.Context, stateDir string, extraHosts []executor.HostIP, idmap *idtools.IdentityMapping, hostname string) (string, func(), error) {
 	if len(extraHosts) == 0 {
 		_, err := g.Do(ctx, stateDir, func(ctx context.Context) (interface{}, error) {
-			_, _, err := makeHostsFile(stateDir, nil, idmap)
+			_, _, err := makeHostsFile(stateDir, nil, idmap, hostname)
 			return nil, err
 		})
 		if err != nil {
 			return "", nil, err
 		}
 		return filepath.Join(stateDir, "hosts"), func() {}, nil
 	}
-	return makeHostsFile(stateDir, extraHosts, idmap)
+	return makeHostsFile(stateDir, extraHosts, idmap, hostname)
 }
 
-func makeHostsFile(stateDir string, extraHosts []executor.HostIP, idmap *idtools.IdentityMapping) (string, func(), error) {
+func makeHostsFile(stateDir string, extraHosts []executor.HostIP, idmap *idtools.IdentityMapping, hostname string) (string, func(), error) {
 	p := filepath.Join(stateDir, "hosts")
 	if len(extraHosts) != 0 {
 		p += "." + identity.NewID()
@@ -47,7 +48,11 @@ func makeHostsFile(stateDir string, extraHosts []executor.HostIP, idmap *idtools
 
 	b := &bytes.Buffer{}
 
-	if _, err := b.Write([]byte(hostsContent)); err != nil {
+	var hosts = hostsContent
+	if hostname != "" {
+		hosts = strings.Replace(hosts, "buildkitsandbox", hostname, 1)
+	}
+	if _, err := b.Write([]byte(hosts)); err != nil {
 		return "", nil, err
 	}
 

diff --git a/executor/oci/spec_unix.go b/executor/oci/spec_unix.go
@@ -65,7 +65,11 @@ func GenerateSpec(ctx context.Context, meta executor.Meta, mounts []executor.Mou
 	s.Process.Cwd = meta.Cwd
 	s.Process.Rlimits = nil           // reset open files limit
 	s.Process.NoNewPrivileges = false // reset nonewprivileges
+
 	s.Hostname = "buildkitsandbox"
+	if meta.Hostname != "" {
+		s.Hostname = meta.Hostname
+	}
 
 	s.Mounts, err = GetMounts(ctx,
 		withProcessMode(processMode),

diff --git a/executor/runcexecutor/executor.go b/executor/runcexecutor/executor.go
@@ -142,7 +142,7 @@ func (w *runcExecutor) Exec(ctx context.Context, meta executor.Meta, root cache.
 		return err
 	}
 
-	hostsFile, clean, err := oci.GetHostsFile(ctx, w.root, meta.ExtraHosts, w.idmap)
+	hostsFile, clean, err := oci.GetHostsFile(ctx, w.root, meta.ExtraHosts, w.idmap, meta.Hostname)
 	if err != nil {
 		return err
 	}

diff --git a/frontend/dockerfile/dockerfile2llb/convert.go b/frontend/dockerfile/dockerfile2llb/convert.go
@@ -315,6 +315,9 @@ func Dockerfile2LLB(ctx context.Context, dt []byte, opt ConvertOpt) (*llb.State,
 			k, v := parseKeyValue(env)
 			d.state = d.state.AddEnv(k, v)
 		}
+		if val, ok := opt.BuildArgs["HOSTNAME"]; ok {
+			d.state = d.state.Hostname(val)
+		}
 		if d.image.Config.WorkingDir != "" {
 			if err = dispatchWorkdir(d, &instructions.WorkdirCommand{Path: d.image.Config.WorkingDir}, false, nil); err != nil {
 				return nil, nil, err

diff --git a/solver/llbsolver/ops/exec.go b/solver/llbsolver/ops/exec.go
@@ -693,6 +693,7 @@ func (e *execOp) Exec(ctx context.Context, inputs []solver.Result) ([]solver.Res
 		Env:            e.op.Meta.Env,
 		Cwd:            e.op.Meta.Cwd,
 		User:           e.op.Meta.User,
+		Hostname:       e.op.Meta.Hostname,
 		ReadonlyRootFS: readonlyRootFS,
 		ExtraHosts:     extraHosts,
 		NetMode:        e.op.Network,