james/nixery
1
0
Fork 0
mirror of https://code.tvl.fyi/depot.git:/tools/nixery.git synced 2025-03-15 22:21:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(go): Registry API acknowledgement URI has a trailing slash

Browse Source 
Previously the acknowledgement calls from Docker were receiving a
404 (which apparently doesn't bother it?!). This corrects the URL,
which meant that acknowledgement had to move inside of the
registryHandler.
This commit is contained in:
Vincent Ambo 2019-08-03 01:18:14 +01:00 committed by Vincent Ambo
parent 18ef0d56fd
commit f2d272b835
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main.go
View File

@ -367,6 +367,11 @@ type registryHandler struct {
} }
func (h *registryHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (h *registryHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// Acknowledge that we speak V2 with an empty response
if r.RequestURI == "/v2/" {
return
}
// Serve the manifest (straight from Nix) // Serve the manifest (straight from Nix)
manifestMatches := manifestRegex.FindStringSubmatch(r.RequestURI) manifestMatches := manifestRegex.FindStringSubmatch(r.RequestURI)
if len(manifestMatches) == 3 { if len(manifestMatches) == 3 {
@ -436,12 +441,7 @@ func main() {
log.Printf("Starting Kubernetes Nix controller on port %s\n", cfg.port) log.Printf("Starting Kubernetes Nix controller on port %s\n", cfg.port)
// Acknowledge that we speak V2 // All /v2/ requests belong to the registry handler.
http.HandleFunc("/v2", func(w http.ResponseWriter, r *http.Request) {
fmt.Fprintln(w)
})
// All other /v2/ requests belong to the registry handler.
http.Handle("/v2/", &registryHandler{ http.Handle("/v2/", &registryHandler{
cfg: cfg, cfg: cfg,
ctx: &ctx, ctx: &ctx,