github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #2386 from northtyphoon/bindu/acr-push-location

Browse Source 
docker/pusher: handle location string containing path and query
This commit is contained in:
Michael Crosby 2018-06-05 18:54:29 -04:00 committed by GitHub
commit 437e90aa5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
remotes/docker/pusher.go
View File

@ -155,9 +155,18 @@ func (p dockerPusher) Push(ctx context.Context, desc ocispec.Descriptor) (conten
location := resp.Header.Get("Location") location := resp.Header.Get("Location")
// Support paths without host in location // Support paths without host in location
if strings.HasPrefix(location, "/") { if strings.HasPrefix(location, "/") {
u := p.base // Support location string containing path and query
u.Path = location qmIndex := strings.Index(location, "?")
location = u.String() if qmIndex > 0 {
u := p.base
u.Path = location[:qmIndex]
u.RawQuery = location[qmIndex+1:]
location = u.String()
} else {
u := p.base
u.Path = location
location = u.String()
}
} }
req, err = http.NewRequest(http.MethodPut, location, nil) req, err = http.NewRequest(http.MethodPut, location, nil)