docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding engine-api client 

Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
This commit is contained in:
Nishant Totla 2016-02-20 20:10:37 -08:00
parent 51f49d78f5
commit d4cfba1844
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cluster/engine.go
View File

@ -15,6 +15,7 @@ import (
log "github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/version" "github.com/docker/docker/pkg/version"
engineapi "github.com/docker/engine-api/client"
"github.com/samalba/dockerclient" "github.com/samalba/dockerclient"
"github.com/samalba/dockerclient/nopclient" "github.com/samalba/dockerclient/nopclient"
) )
@ -109,6 +110,7 @@ type Engine struct {
networks map[string]*Network networks map[string]*Network
volumes map[string]*Volume volumes map[string]*Volume
client dockerclient.Client client dockerclient.Client
apiClient engineapi.APIClient
eventHandler EventHandler eventHandler EventHandler
state engineState state engineState
lastError string lastError string
@ -163,7 +165,6 @@ func (e *Engine) Connect(config *tls.Config) error {
if err != nil { if err != nil {
return err return err
} }
return e.ConnectWithClient(c) return e.ConnectWithClient(c)
} }
@ -188,6 +189,14 @@ func (e *Engine) StartMonitorEvents() {
func (e *Engine) ConnectWithClient(client dockerclient.Client) error { func (e *Engine) ConnectWithClient(client dockerclient.Client) error {
e.client = client e.client = client
// Use HTTP Client used by dockerclient to create engine-api client
httpClient, _ := e.HTTPClientAndScheme()
apiClient, err := engineapi.NewClient("tcp://"+e.Addr, "", httpClient, nil)
if err != nil {
return err
}
e.apiClient = apiClient
// Fetch the engine labels. // Fetch the engine labels.
if err := e.updateSpecs(); err != nil { if err := e.updateSpecs(); err != nil {
return err return err