Remove old http from the docker cli.

Everything has been ported to the client library 🎉

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 5a0a6ee9cd55f3e2f57d992a032421d0e126040d
Component: engine
This commit is contained in:
David Calavera
2015-12-06 19:35:56 -05:00
parent 36248d540f
commit 1c8ead7dbd
6 changed files with 18 additions and 526 deletions

View File

@ -1,11 +1,9 @@
package client
import (
"crypto/tls"
"errors"
"fmt"
"io"
"net/http"
"os"
"runtime"
@ -44,22 +42,6 @@ type DockerCli struct {
isTerminalOut bool
// client is the http client that performs all API operations
client apiClient
// DEPRECATED OPTIONS TO MAKE THE CLIENT COMPILE
// TODO: Remove
// proto holds the client protocol i.e. unix.
proto string
// addr holds the client address.
addr string
// basePath holds the path to prepend to the requests
basePath string
// tlsConfig holds the TLS configuration for the client, and will
// set the scheme to https in NewDockerCli if present.
tlsConfig *tls.Config
// scheme holds the scheme of the client i.e. https.
scheme string
// transport holds the client transport instance.
transport *http.Transport
}
// Initialize calls the init function that will setup the configuration for the client
@ -126,12 +108,6 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, clientFlags *cli.ClientF
}
cli.client = client
// FIXME: Deprecated, only to keep the old code running.
cli.transport = client.HTTPClient.Transport.(*http.Transport)
cli.basePath = client.BasePath
cli.addr = client.Addr
cli.scheme = client.Scheme
if cli.in != nil {
cli.inFd, cli.isTerminalIn = term.GetFdInfo(cli.in)
}