mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Added X-Docker-Token header to initial index requests
This commit is contained in:
parent
ea3374bcb0
commit
3c85e9390e
1 changed files with 5 additions and 1 deletions
|
@ -239,7 +239,7 @@ func (graph *Graph) PullRepository(stdout io.Writer, remote, askedTag string, re
|
||||||
client := graph.getHttpClient()
|
client := graph.getHttpClient()
|
||||||
|
|
||||||
fmt.Fprintf(stdout, "Pulling repository %s\r\n", remote)
|
fmt.Fprintf(stdout, "Pulling repository %s\r\n", remote)
|
||||||
repositoryTarget := INDEX_ENDPOINT + "/repositories/" + remote + "/checksums"
|
repositoryTarget := INDEX_ENDPOINT + "/repositories/" + remote + "/checksums/"
|
||||||
|
|
||||||
req, err := http.NewRequest("GET", repositoryTarget, nil)
|
req, err := http.NewRequest("GET", repositoryTarget, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -248,6 +248,7 @@ func (graph *Graph) PullRepository(stdout io.Writer, remote, askedTag string, re
|
||||||
if authConfig != nil {
|
if authConfig != nil {
|
||||||
req.SetBasicAuth(authConfig.Username, authConfig.Password)
|
req.SetBasicAuth(authConfig.Username, authConfig.Password)
|
||||||
}
|
}
|
||||||
|
req.Header.Set("X-Docker-Token", "true")
|
||||||
|
|
||||||
res, err := client.Do(req)
|
res, err := client.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -461,6 +462,7 @@ func (graph *Graph) PushRepository(stdout io.Writer, remote string, localRepo Re
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
req.SetBasicAuth(authConfig.Username, authConfig.Password)
|
req.SetBasicAuth(authConfig.Username, authConfig.Password)
|
||||||
|
req.Header.Set("X-Docker-Token", "true")
|
||||||
res, err := client.Do(req)
|
res, err := client.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -473,6 +475,7 @@ func (graph *Graph) PushRepository(stdout io.Writer, remote string, localRepo Re
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
req.SetBasicAuth(authConfig.Username, authConfig.Password)
|
req.SetBasicAuth(authConfig.Username, authConfig.Password)
|
||||||
|
req.Header.Set("X-Docker-Token", "true")
|
||||||
res, err = client.Do(req)
|
res, err = client.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -488,6 +491,7 @@ func (graph *Graph) PushRepository(stdout io.Writer, remote string, localRepo Re
|
||||||
if res.Header.Get("X-Docker-Token") != "" {
|
if res.Header.Get("X-Docker-Token") != "" {
|
||||||
token = res.Header["X-Docker-Token"]
|
token = res.Header["X-Docker-Token"]
|
||||||
} else {
|
} else {
|
||||||
|
Debugf("Response headers:\n %s\n", res.Header)
|
||||||
return fmt.Errorf("Index response didn't contain an access token")
|
return fmt.Errorf("Index response didn't contain an access token")
|
||||||
}
|
}
|
||||||
if res.Header.Get("X-Docker-Endpoints") != "" {
|
if res.Header.Get("X-Docker-Endpoints") != "" {
|
||||||
|
|
Loading…
Reference in a new issue