[FAB-9659] Update fsouza/go-dockerclient to v1.0.0

This supports Docker API version 1.23 and contains network function
needed by the e2e tests.

Change-Id: I524cc14050170905ee14f499bfc870cea5de00e6
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>

Author: lhaskins

Gopkg.lock

@@ -29,7 +29,7 @@ ignored = [
 
 [[constraint]]
   name = "github.com/fsouza/go-dockerclient"
-  version = "docker-1.9/go-1.4"
+  version = "1.0.0"
 
 [[constraint]]
   branch = "master"

Gopkg.toml

@@ -95,6 +95,7 @@ func (c *CouchDB) Run(sigCh <-chan os.Signal, ready chan<- struct{}) error {
 	}
 
 	hostConfig := &docker.HostConfig{
+		AutoRemove: true,
 		PortBindings: map[docker.Port][]docker.PortBinding{
 			c.ContainerPort: []docker.PortBinding{{
 				HostIP:   c.HostIP,
@@ -134,10 +135,9 @@ func (c *CouchDB) Run(sigCh <-chan os.Signal, ready chan<- struct{}) error {
 		c.ContainerPort.Port(),
 	)
 
-	err = c.streamLogs()
-	if err != nil {
-		return err
-	}
+	streamCtx, streamCancel := context.WithCancel(context.Background())
+	defer streamCancel()
+	go c.streamLogs(streamCtx)
 
 	containerExit := c.wait()
 	ctx, cancel := context.WithTimeout(context.Background(), c.StartTimeout)
@@ -211,20 +211,25 @@ func (c *CouchDB) wait() <-chan error {
 	return exitCh
 }
 
-func (c *CouchDB) streamLogs() error {
+func (c *CouchDB) streamLogs(ctx context.Context) {
 	if c.ErrorStream == nil && c.OutputStream == nil {
-		return nil
+		return
 	}
 
 	logOptions := docker.LogsOptions{
+		Context:      ctx,
 		Container:    c.containerID,
+		Follow:       true,
 		ErrorStream:  c.ErrorStream,
 		OutputStream: c.OutputStream,
 		Stderr:       c.ErrorStream != nil,
 		Stdout:       c.OutputStream != nil,
 	}
 
-	return c.Client.Logs(logOptions)
+	err := c.Client.Logs(logOptions)
+	if err != nil {
+		fmt.Fprintf(c.ErrorStream, "log stream ended with error: %s", err)
+	}
 }
 
 // Address returns the address successfully used by the readiness check.
@@ -275,10 +280,5 @@ func (c *CouchDB) Stop() error {
 		return err
 	}
 
-	return c.Client.RemoveContainer(
-		docker.RemoveContainerOptions{
-			ID:    c.containerID,
-			Force: true,
-		},
-	)
+	return nil
 }

integration/runner/couchdb.go

@@ -40,8 +40,6 @@ var _ = Describe("CouchDB Runner", func() {
 		stopResponse    string
 		waitStatus      int
 		waitResponse    string
-		deleteStatus    int
-		deleteResponse  string
 
 		waitChan chan struct{}
 		client   *docker.Client
@@ -70,6 +68,13 @@ var _ = Describe("CouchDB Runner", func() {
 		dockerServer = ghttp.NewServer()
 		dockerServer.Writer = GinkgoWriter
 
+		dockerServer.RouteToHandler("GET", "/version", ghttp.CombineHandlers(
+			ghttp.VerifyRequest("GET", "/version"),
+			ghttp.RespondWithJSONEncoded(http.StatusOK, map[string]string{
+				"ApiVersion": "1.29",
+			}),
+		))
+
 		createStatus = http.StatusCreated
 		createResponse = &docker.Container{
 			ID: "container-id",
@@ -104,7 +109,7 @@ var _ = Describe("CouchDB Runner", func() {
 
 		logsStatus = http.StatusOK
 		dockerServer.RouteToHandler("GET", "/containers/container-id/logs", ghttp.CombineHandlers(
-			ghttp.VerifyRequest("GET", "/containers/container-id/logs", "stderr=1&stdout=1&tail=all"),
+			ghttp.VerifyRequest("GET", "/containers/container-id/logs", "follow=1&stderr=1&stdout=1&tail=all"),
 			ghttp.RespondWithPtr(&logsStatus, &logsResponse),
 		))
 
@@ -125,12 +130,6 @@ var _ = Describe("CouchDB Runner", func() {
 			func(w http.ResponseWriter, r *http.Request) { <-waitChan },
 		))
 
-		deleteStatus = http.StatusNoContent
-		dockerServer.RouteToHandler("DELETE", "/containers/container-id", ghttp.CombineHandlers(
-			ghttp.VerifyRequest("DELETE", "/containers/container-id", "force=1"),
-			ghttp.RespondWithPtr(&deleteStatus, &deleteResponse),
-		))
-
 		client, err = docker.NewClient(dockerServer.URL())
 		Expect(err).NotTo(HaveOccurred())
 
@@ -203,7 +202,7 @@ var _ = Describe("CouchDB Runner", func() {
 	It("can be started and stopped with ifrit", func() {
 		process = ifrit.Invoke(couchDB)
 		Eventually(process.Ready()).Should(BeClosed())
-		Expect(dockerServer.ReceivedRequests()).To(HaveLen(5))
+		Expect(dockerServer.ReceivedRequests()).To(HaveLen(6))
 
 		process.Signal(syscall.SIGTERM)
 		Eventually(process.Wait()).Should(Receive())
@@ -214,7 +213,7 @@ var _ = Describe("CouchDB Runner", func() {
 	It("can be started and stopped without ifrit", func() {
 		err := couchDB.Start()
 		Expect(err).NotTo(HaveOccurred())
-		Expect(dockerServer.ReceivedRequests()).To(HaveLen(5))
+		Expect(dockerServer.ReceivedRequests()).To(HaveLen(6))
 
 		err = couchDB.Stop()
 		Expect(err).NotTo(HaveOccurred())
@@ -232,6 +231,7 @@ var _ = Describe("CouchDB Runner", func() {
 					Image: "hyperledger/fabric-couchdb:latest",
 				},
 				HostConfig: &docker.HostConfig{
+					AutoRemove: true,
 					PortBindings: map[docker.Port][]docker.PortBinding{
 						docker.Port("5984/tcp"): []docker.PortBinding{{
 							HostIP:   "127.0.0.1",
@@ -336,9 +336,10 @@ var _ = Describe("CouchDB Runner", func() {
 			logsStatus = http.StatusConflict
 		})
 
-		It("returns an error", func() {
+		It("it records the error", func() {
 			err := couchDB.Start()
-			Expect(err).To(HaveOccurred())
+			Expect(err).NotTo(HaveOccurred())
+			Eventually(errBuffer).Should(gbytes.Say(`log stream ended with error: API error`))
 		})
 	})
 
@@ -399,20 +400,6 @@ var _ = Describe("CouchDB Runner", func() {
 		})
 	})
 
-	Context("when removing the container fails", func() {
-		BeforeEach(func() {
-			deleteStatus = http.StatusNotFound
-		})
-
-		It("returns an error", func() {
-			err := couchDB.Start()
-			Expect(err).NotTo(HaveOccurred())
-
-			err = couchDB.Stop()
-			Expect(err).To(HaveOccurred())
-		})
-	})
-
 	Context("when startup times out", func() {
 		BeforeEach(func() {
 			couchDB.StartTimeout = 50 * time.Millisecond