Add context to api calls

Author: abiosoft

cli/container.go

@@ -8,6 +8,7 @@ import (
 	"github.com/docker/engine-api/types/container"
 	"github.com/docker/engine-api/types/strslice"
 	"github.com/docker/go-connections/nat"
+	"golang.org/x/net/context"
 )
 
 var errNetworkNotFound = errors.New("Error: Network not found. Consider restarting dockward.")
@@ -21,7 +22,7 @@ func imageString() string {
 
 // containerIp retrieves the ip address of container with id on the dockward network.
 func containerIp(id string) (string, error) {
-	info, err := client.ContainerInspect(id)
+	info, err := client.ContainerInspect(context.Background(), id)
 	if err != nil {
 		return "", err
 	}
@@ -80,7 +81,7 @@ func launchBalancerContainer(hostPort int, monitorPort int, policy string, desti
 		},
 	}
 
-	resp, err := client.ContainerCreate(containerConf, hostConf, nil, "")
+	resp, err := client.ContainerCreate(context.Background(), containerConf, hostConf, nil, "")
 	if err != nil {
 		return err
 	}
@@ -89,12 +90,12 @@ func launchBalancerContainer(hostPort int, monitorPort int, policy string, desti
 		return err
 	}
 
-	if err := client.ContainerStart(resp.ID); err != nil {
+	if err := client.ContainerStart(context.Background(), resp.ID); err != nil {
 		return err
 	}
 
 	addCleanUpFunc(func() {
-		client.ContainerKill(resp.ID, "")
+		client.ContainerKill(context.Background(), resp.ID, "")
 	})
 
 	return err

cli/docker.go

@@ -36,7 +36,7 @@ func setupDocker() error {
 
 func pullImage() error {
 	// check if image is already pulled
-	l, err := client.ImageList(types.ImageListOptions{})
+	l, err := client.ImageList(context.Background(), types.ImageListOptions{})
 	for i := range l {
 		for _, tag := range l[i].RepoTags {
 			if tag == imageString() {

cli/filter.go

@@ -4,6 +4,7 @@ import (
 	"github.com/abiosoft/dockward/balancer"
 	"github.com/docker/engine-api/types"
 	"github.com/docker/engine-api/types/filters"
+	"golang.org/x/net/context"
 )
 
 type filterType string
@@ -19,7 +20,7 @@ const (
 func endpointsFromFilter(containerPort int, key, value string) (balancer.Endpoints, error) {
 	filter := filters.NewArgs()
 	filter.Add(key, value)
-	containers, err := client.ContainerList(types.ContainerListOptions{Filter: filter})
+	containers, err := client.ContainerList(context.Background(), types.ContainerListOptions{Filter: filter})
 	if err != nil {
 		return nil, err
 	}

cli/monitor.go

@@ -115,7 +115,7 @@ func updateContainerEndpoints(msg balancer.Message, dockerHost string, endpointP
 
 // validContainer validates if the container can be added/removed from endpoints.
 func validContainer(name string, label string) bool {
-	info, err := client.ContainerInspect(name)
+	info, err := client.ContainerInspect(context.Background(), name)
 	if err != nil {
 		log.Println(err)
 		return false

network/network.go

@@ -4,6 +4,7 @@ import (
 	"github.com/abiosoft/dockward/util"
 	docker "github.com/docker/engine-api/client"
 	"github.com/docker/engine-api/types"
+	"golang.org/x/net/context"
 )
 
 const namePrefix = "dockward_"
@@ -24,7 +25,7 @@ func Create(client *docker.Client) (*Network, error) {
 
 // Create creates a new network using name.
 func CreateWithName(client *docker.Client, name string) (*Network, error) {
-	n, err := client.NetworkCreate(types.NetworkCreate{Name: name, Internal: true})
+	n, err := client.NetworkCreate(context.Background(), types.NetworkCreate{Name: name, Internal: true})
 	if err != nil {
 		return nil, err
 	}
@@ -37,27 +38,27 @@ func CreateWithName(client *docker.Client, name string) (*Network, error) {
 
 // ConnectContainer connects docker container with id to the network.
 func (n *Network) ConnectContainer(id string) error {
-	return n.client.NetworkConnect(n.Id, id, nil)
+	return n.client.NetworkConnect(context.Background(), n.Id, id, nil)
 }
 
 // DisconnectContainer disconnects docker container with id from the network.
 func (n *Network) DisconnectContainer(id string) error {
-	return n.client.NetworkDisconnect(n.Id, id, false)
+	return n.client.NetworkDisconnect(context.Background(), n.Id, id, false)
 }
 
 // Stop disconnects all connected docker containers from the network and
 // removes the network.
 func (n *Network) Stop() error {
-	info, err := n.client.NetworkInspect(n.Id)
+	info, err := n.client.NetworkInspect(context.Background(), n.Id)
 	if err != nil {
 		return err
 	}
 	// disconnect all containers from it
 	for id, _ := range info.Containers {
-		if err := n.client.NetworkDisconnect(n.Id, id, true); err != nil {
+		if err := n.client.NetworkDisconnect(context.Background(), n.Id, id, true); err != nil {
 			return err
 		}
 	}
 	// Remove network
-	return n.client.NetworkRemove(n.Id)
+	return n.client.NetworkRemove(context.Background(), n.Id)
 }