fcrozat/distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove stdout from registry

Browse Source
This commit is contained in:
Guillaume J. Charmes 2013-05-15 18:50:52 +00:00
parent a2e94b289c
commit b5d8930631
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docs/registry.go
View File

@ -112,10 +112,9 @@ func (r *Registry) getImagesInRepository(repository string, authConfig *auth.Aut
// Retrieve an image from the Registry. // Retrieve an image from the Registry.
// Returns the Image object as well as the layer as an Archive (io.Reader) // Returns the Image object as well as the layer as an Archive (io.Reader)
func (r *Registry) GetRemoteImageJson(stdout io.Writer, imgId, registry string, token []string) ([]byte, error) { func (r *Registry) GetRemoteImageJson(imgId, registry string, token []string) ([]byte, error) {
client := r.getHttpClient() client := r.getHttpClient()
fmt.Fprintf(stdout, "Pulling %s metadata\r\n", imgId)
// Get the Json // Get the Json
req, err := http.NewRequest("GET", registry+"/images/"+imgId+"/json", nil) req, err := http.NewRequest("GET", registry+"/images/"+imgId+"/json", nil)
if err != nil { if err != nil {
@ -137,22 +136,22 @@ func (r *Registry) GetRemoteImageJson(stdout io.Writer, imgId, registry string,
return jsonString, nil return jsonString, nil
} }
func (r *Registry) GetRemoteImageLayer(stdout io.Writer, imgId, registry string, token []string) (io.Reader, error) { func (r *Registry) GetRemoteImageLayer(imgId, registry string, token []string) (io.ReadCloser, int, error) {
client := r.getHttpClient() client := r.getHttpClient()
req, err := http.NewRequest("GET", registry+"/images/"+imgId+"/layer", nil) req, err := http.NewRequest("GET", registry+"/images/"+imgId+"/layer", nil)
if err != nil { if err != nil {
return nil, fmt.Errorf("Error while getting from the server: %s\n", err) return nil, -1, fmt.Errorf("Error while getting from the server: %s\n", err)
} }
req.Header.Set("Authorization", "Token "+strings.Join(token, ", ")) req.Header.Set("Authorization", "Token "+strings.Join(token, ", "))
res, err := client.Do(req) res, err := client.Do(req)
if err != nil { if err != nil {
return nil, err return nil, -1, err
} }
return utils.ProgressReader(res.Body, int(res.ContentLength), stdout, "Downloading %v/%v (%v)"), nil return res.Body, int(res.ContentLength), nil
} }
func (r *Registry) GetRemoteTags(stdout io.Writer, registries []string, repository string, token []string) (map[string]string, error) { func (r *Registry) GetRemoteTags(registries []string, repository string, token []string) (map[string]string, error) {
client := r.getHttpClient() client := r.getHttpClient()
if strings.Count(repository, "/") == 0 { if strings.Count(repository, "/") == 0 {
// This will be removed once the Registry supports auto-resolution on // This will be removed once the Registry supports auto-resolution on
@ -189,7 +188,7 @@ func (r *Registry) GetRemoteTags(stdout io.Writer, registries []string, reposito
return nil, fmt.Errorf("Could not reach any registry endpoint") return nil, fmt.Errorf("Could not reach any registry endpoint")
} }
func (r *Registry) getImageForTag(stdout io.Writer, tag, remote, registry string, token []string) (string, error) { func (r *Registry) getImageForTag(tag, remote, registry string, token []string) (string, error) {
client := r.getHttpClient() client := r.getHttpClient()
if !strings.Contains(remote, "/") { if !strings.Contains(remote, "/") {
@ -466,7 +465,7 @@ func (r *Registry) PushImageJsonIndex(remote string, imgList []*ImgData, validat
}, nil }, nil
} }
func (r *Registry) SearchRepositories(stdout io.Writer, term string) (*SearchResults, error) { func (r *Registry) SearchRepositories(term string) (*SearchResults, error) {
client := r.getHttpClient() client := r.getHttpClient()
u := auth.IndexServerAddress() + "/search?q=" + url.QueryEscape(term) u := auth.IndexServerAddress() + "/search?q=" + url.QueryEscape(term)
req, err := http.NewRequest("GET", u, nil) req, err := http.NewRequest("GET", u, nil)