Merge pull request #209 from csrwng/undo_dns_params

Merged by openshift-bot

Author: OpenShift Bot

pkg/api/types.go

@@ -69,12 +69,6 @@ type Config struct {
 	// Specify a relative directory inside the application repository that should
 	// be used as a root directory for the application.
 	ContextDir string
-
-	// DNS servers to use when running build container
-	DNS []string
-
-	// DNS search suffixes to use when running build container
-	DNSSearch []string
 }
 
 // DockerConfig contains the configuration for a Docker connection

pkg/build/strategies/sti/sti.go

@@ -312,8 +312,6 @@ func (b *STI) Save(config *api.Config) (err error) {
 		Stdout:          outWriter,
 		Stderr:          errWriter,
 		OnStart:         extractFunc,
-		DNS:             config.DNS,
-		DNSSearch:       config.DNSSearch,
 	}
 
 	go streamContainerError(errReader, nil, config)
@@ -371,8 +369,6 @@ func (b *STI) Execute(command string, config *api.Config) error {
 		Command:         command,
 		Env:             buildEnv,
 		PostExec:        b.postExecutor,
-		DNS:             config.DNS,
-		DNSSearch:       config.DNSSearch,
 	}
 	if !config.LayeredBuild {
 		opts.Stdin = tarFile

pkg/docker/docker.go

@@ -88,8 +88,6 @@ type RunContainerOptions struct {
 	Stderr          io.Writer
 	OnStart         func() error
 	PostExec        PostExecutor
-	DNS             []string
-	DNSSearch       []string
 }
 
 // CommitContainerOptions are options passed in to the CommitContainer method
@@ -348,16 +346,9 @@ func (d *stiDocker) RunContainer(opts RunContainerOptions) (err error) {
 	if opts.Stdout != nil {
 		config.AttachStdout = true
 	}
-	var hostConfig *docker.HostConfig
-	if opts.DNS != nil || opts.DNSSearch != nil {
-		hostConfig = &docker.HostConfig{
-			DNS:       opts.DNS,
-			DNSSearch: opts.DNSSearch,
-		}
-	}
 
-	glog.V(2).Infof("Creating container using config: %+v and host config: %+v", config, hostConfig)
-	container, err := d.client.CreateContainer(docker.CreateContainerOptions{Name: "", Config: &config, HostConfig: hostConfig})
+	glog.V(2).Infof("Creating container using config: %+v", config)
+	container, err := d.client.CreateContainer(docker.CreateContainerOptions{Name: "", Config: &config})
 	if err != nil {
 		return err
 	}

pkg/docker/docker_test.go

@@ -426,7 +426,6 @@ func TestRunContainer(t *testing.T) {
 			AttachToContainerSleep: 200 * time.Millisecond,
 		}
 		dh := getDocker(fakeDocker)
-		dnsServers := []string{"dnsserver1", "dnsserver2"}
 		err := dh.RunContainer(RunContainerOptions{
 			Image:           "test/image",
 			PullImage:       true,
@@ -438,7 +437,6 @@ func TestRunContainer(t *testing.T) {
 			Stdin:           os.Stdin,
 			Stdout:          os.Stdout,
 			Stderr:          os.Stdout,
-			DNS:             dnsServers,
 		})
 		if err != nil {
 			t.Errorf("%s: Unexpected error: %v", desc, err)
@@ -458,13 +456,6 @@ func TestRunContainer(t *testing.T) {
 			t.Errorf("%s: Unexpected stdin flags for createConfig: OpenStdin - %v"+
 				" StdinOnce - %v", desc, createConfig.OpenStdin, createConfig.StdinOnce)
 		}
-		hostConfig := fakeDocker.CreateContainerOpts.HostConfig
-		if hostConfig == nil {
-			t.Errorf("%s: Expected a valid hostConfig in createContainerOpts")
-		}
-		if hostConfig != nil && !reflect.DeepEqual(hostConfig.DNS, dnsServers) {
-			t.Errorf("%s: Unexpected hostConfig DNS value: %#v", hostConfig.DNS)
-		}
 
 		// Verify that remove container was called
 		if fakeDocker.RemoveContainerOpts.ID != "12345-test" {