We use cookies to ensure you get the best experience on our website
Strona główna Odkrywaj Pomoc
Zarejestruj się Zaloguj się
0ct0pu5
/
moby
1
0
Forkuj 0
Pliki Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

registry: remove use of v1 Version field and X-Docker-Registry-Version

- The `Version` field was not used for any purpose, other than a debug log
- The `X-Docker-Registry-Version` header was part of the registry v1 spec,
  however, as we're not using the `Version` field, we don't need the
  header for anything.
- The `X-Docker-Registry-Config` header was only set by the mock registry;
  there's no code consuming it, so we don't need to mock it (even if an
  actual v1 registry / search API would return it).

It's also worth noting that we never call the `_ping` endpoint when using
Docker Hub's search API, and Docker Hub does not even implement the `_ping`
endpoint;

    curl -fsSL https://index.docker.io/_ping | head -n 4
    <!DOCTYPE html>
    <html lang="en">
    <head>
    <title>Docker</title>

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 1 rok temu
rodzic
152036f0aa
commit
0f7a65e59b
2 zmienionych plików z 2 dodań i 12 usunięć
Zunifikowany widok Pokaż statystyki zmian
  1. 1 3
      registry/registry_mock_test.go
  2. 1 9
      registry/search_endpoint_v1.go

+ 1 - 3
registry/registry_mock_test.go
Wyświetl plik 

@@ -114,8 +114,6 @@ func writeHeaders(w http.ResponseWriter) {
 
 	h.Add("Content-Type", "application/json")
 
 	h.Add("Content-Type", "application/json")
 
 	h.Add("Pragma", "no-cache")
 
 	h.Add("Pragma", "no-cache")
 
 	h.Add("Cache-Control", "no-cache")
 
 	h.Add("Cache-Control", "no-cache")
 
-	h.Add("X-Docker-Registry-Version", "0.0.0")
 
-	h.Add("X-Docker-Registry-Config", "mock")
 
 }
 
 }
 
 
 
 func writeResponse(w http.ResponseWriter, message interface{}, code int) {
 
 func writeResponse(w http.ResponseWriter, message interface{}, code int) {
 
@@ -156,5 +154,5 @@ func TestPing(t *testing.T) {
 
 		t.Fatal(err)
 
 		t.Fatal(err)
 
 	}
 
 	}
 
 	assert.Equal(t, res.StatusCode, http.StatusOK, "")
 
 	assert.Equal(t, res.StatusCode, http.StatusOK, "")
 
-	assert.Equal(t, res.Header.Get("X-Docker-Registry-Config"), "mock", "This is not a Mocked Registry")
 
+	assert.Equal(t, res.Header.Get("Server"), "docker-tests/mock")
 
 }
 
 }

+ 1 - 9
registry/search_endpoint_v1.go
Wyświetl plik 

@@ -15,12 +15,8 @@ import (
 
 )
 
 )
 
 
 
 // v1PingResult contains the information returned when pinging a registry. It
 
 // v1PingResult contains the information returned when pinging a registry. It
 
-// indicates the registry's version and whether the registry claims to be a
 
-// standalone registry.
 
+// indicates whether the registry claims to be a standalone registry.
 
 type v1PingResult struct {
 
 type v1PingResult struct {
 
-	// Version is the registry version supplied by the registry in an HTTP
 
-	// header
 
-	Version string `json:"version"`
 
 	// Standalone is set to true if the registry indicates it is a
 
 	// Standalone is set to true if the registry indicates it is a
 
 	// standalone registry in the X-Docker-Registry-Standalone
 
 	// standalone registry in the X-Docker-Registry-Standalone
 
 	// header
 
 	// header
 
@@ -158,10 +154,6 @@ func (e *v1Endpoint) ping() (v1PingResult, error) {
 
 		log.G(context.TODO()).WithError(err).Debug("error unmarshaling _ping response")
 
 		log.G(context.TODO()).WithError(err).Debug("error unmarshaling _ping response")
 
 		// don't stop here. Just assume sane defaults
 
 		// don't stop here. Just assume sane defaults
 
 	}
 
 	}
 
-	if hdr := resp.Header.Get("X-Docker-Registry-Version"); hdr != "" {
 
-		info.Version = hdr
 
-	}
 
-	log.G(context.TODO()).Debugf("v1PingResult.Version: %q", info.Version)
 
 
 
 	standalone := resp.Header.Get("X-Docker-Registry-Standalone")
 
 	standalone := resp.Header.Get("X-Docker-Registry-Standalone")

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5