vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

don't panic during a request when configuring repository middleware. Return a 500 with an appropriate error

Browse source 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
This commit is contained in:
David Lawrence 2015-03-09 10:55:52 -07:00
parent 5c3f53b70f
commit 83571e574c
2 changed files with 52 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/storage/layerreader.go
View file

@ -18,10 +18,6 @@ type layerReader struct {
var _ distribution.Layer = &layerReader{}
func (lr *layerReader) Path() string {
return lr.path
}
func (lr *layerReader) Digest() digest.Digest {
return lr.digest
}
@ -42,7 +38,7 @@ func (lr *layerReader) Close() error {
func (lr *layerReader) ServeHTTP(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Docker-Content-Digest", lr.digest.String())
if url, err := lr.fileReader.driver.URLFor(lr.Path(), map[string]interface{}{}); err == nil {
if url, err := lr.fileReader.driver.URLFor(lr.path, map[string]interface{}{}); err == nil {
http.Redirect(w, r, url, http.StatusTemporaryRedirect)
}
http.ServeContent(w, r, lr.digest.String(), lr.CreatedAt(), lr)