mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(server): Correctly construct filesystem paths for layer serving

Browse source
This commit is contained in:
Vincent Ambo 2019-10-28 18:22:02 +01:00 committed by Vincent Ambo
parent b60a8d007b
commit 4332d38f4f
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/nixery/server/storage/filesystem.go
View file

@ -68,12 +68,14 @@ func (b *FSBackend) Move(old, new string) error {
return os.Rename(path.Join(b.path, old), newpath) return os.Rename(path.Join(b.path, old), newpath)
} }
func (b *FSBackend) ServeLayer(digest string, w http.ResponseWriter) error { func (b *FSBackend) ServeLayer(digest string, r *http.Request, w http.ResponseWriter) error {
// http.Serve* functions attempt to be a lot more clever than p := path.Join(b.path, "layers", digest)
// I want, but I also would prefer to avoid implementing error
// translation myself - thus a fake request is created here.
req := http.Request{Method: "GET"}
http.ServeFile(w, &req, path.Join(b.path, "sha256:"+digest))
log.WithFields(log.Fields{
"layer": digest,
"path": p,
}).Info("serving layer from filesystem")
http.ServeFile(w, r, p)
return nil return nil
} }