Add redirect and env proxy support to docker login

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
This commit is contained in:
Victor Vieux 2014-06-03 00:46:06 +00:00
parent 96412d40fd
commit 0ac3b3981f

View File

@ -5,12 +5,13 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"github.com/dotcloud/docker/utils"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"os" "os"
"path" "path"
"strings" "strings"
"github.com/dotcloud/docker/utils"
) )
// Where we store the config file // Where we store the config file
@ -152,10 +153,16 @@ func SaveConfig(configFile *ConfigFile) error {
// try to register/login to the registry server // try to register/login to the registry server
func Login(authConfig *AuthConfig, factory *utils.HTTPRequestFactory) (string, error) { func Login(authConfig *AuthConfig, factory *utils.HTTPRequestFactory) (string, error) {
var ( var (
status string status string
reqBody []byte reqBody []byte
err error err error
client = &http.Client{} client = &http.Client{
Transport: &http.Transport{
DisableKeepAlives: true,
Proxy: http.ProxyFromEnvironment,
},
CheckRedirect: AddRequiredHeadersToRedirectedRequests,
}
reqStatusCode = 0 reqStatusCode = 0
serverAddress = authConfig.ServerAddress serverAddress = authConfig.ServerAddress
) )