FAB-15666 Pass NetworkMode in DockerBuildOptions

NetworkMode was being passed when laucnching containers but not when
building images.

FAB-15666 #done

Change-Id: Id097594bd587bed131cf9c4b7131af66ea380973
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>

core/container/dockercontroller/dockercontroller.go

@@ -200,12 +200,14 @@ func (vm *DockerVM) deployImage(client dockerClient, ccid ccintf.CCID, reader io
 		return err
 	}
 
+	networkMode := getDockerHostConfig().NetworkMode
 	outputbuf := bytes.NewBuffer(nil)
 	opts := docker.BuildImageOptions{
 		Name:         id,
 		Pull:         viper.GetBool("chaincode.pull"),
 		InputStream:  reader,
 		OutputStream: outputbuf,
+		NetworkMode:  networkMode,
 	}
 
 	startTime := time.Now()

core/container/dockercontroller/dockercontroller_test.go

@@ -420,14 +420,24 @@ func Test_deployImage(t *testing.T) {
 		Pull:         viper.GetBool("chaincode.pull"),
 		InputStream:  nil,
 		OutputStream: bytes.NewBuffer(nil),
+		NetworkMode:  "host",
 	}
 
-	client.BuildImageStub = func(buildOpts docker.BuildImageOptions) error {
-		gt.Expect(buildOpts).To(Equal(expectedOpts))
-		return nil
-	}
 	err = dockerVM.deployImage(client, ccid, nil)
 	gt.Expect(err).NotTo(HaveOccurred())
+	gt.Expect(client.BuildImageCallCount()).To(Equal(1))
+	gt.Expect(client.BuildImageArgsForCall(0)).To(Equal(expectedOpts))
+
+	// set network mode
+	hostConfig = getDockerHostConfig()
+	hostConfig.NetworkMode = "bridge"
+	expectedOpts.NetworkMode = "bridge"
+	err = dockerVM.deployImage(client, ccid, nil)
+
+	gt.Expect(err).NotTo(HaveOccurred())
+	gt.Expect(client.BuildImageCallCount()).To(Equal(2))
+	gt.Expect(client.BuildImageArgsForCall(1)).To(Equal(expectedOpts))
+	hostConfig = nil
 }
 
 type InMemBuilder struct{}