Merge pull request #444 from mcastelino/topic/docker-1.12

Topic/docker 1.12

.travis.yml

@@ -43,8 +43,6 @@ before_script:
 script:
    - go env
    - docker --version
-   - sudo apt-get install -o Dpkg::Options::="--force-confold" --force-yes -y docker-engine=1.11.2-0~trusty
-   - docker --version
    - sudo docker pull debian
    - sudo ip link add testdummy type dummy
    - sudo ip addr add 198.51.100.1/24 dev testdummy

networking/libsnnet/docker_plugin.go

@@ -29,6 +29,7 @@ import (
 	"time"
 
 	"github.com/01org/ciao/ssntp/uuid"
+	"github.com/docker/go-connections/tlsconfig"
 	"github.com/docker/libnetwork/drivers/remote/api"
 	ipamapi "github.com/docker/libnetwork/ipams/remote/api"
 	"github.com/golang/glog"
@@ -724,11 +725,13 @@ func createDockerPluginConfig(dir string) error {
 	pluginSpecFile := path.Join(dir, DockerPluginCfg.Name+".json")
 
 	var spec struct {
-		Name string
-		Addr string
+		Name      string
+		Addr      string
+		TLSConfig *tlsconfig.Options
 	}
 	spec.Name = DockerPluginCfg.Name
 	spec.Addr = "http://" + DockerPluginCfg.Addr
+	spec.TLSConfig = &tlsconfig.Options{}
 	b, err := json.Marshal(spec)
 	if err != nil {
 		return fmt.Errorf("Unable to create plugin spec (%v) %v", spec, err)