TrueCloudLab/distribution
14
0
Fork 3
Code Issues 2 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Push flow

Browse source 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
This commit is contained in:
Derek McGowan 2014-09-30 17:03:57 -07:00
parent 6b400cd63c
commit 06d0ef4179
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docs/session_v2.go
View file

@ -267,7 +267,7 @@ func (r *Session) GetV2ImageBlobReader(imageName, sumType, sum string, token []s
// Push the image to the server for storage. // Push the image to the server for storage.
// 'layer' is an uncompressed reader of the blob to be pushed. // 'layer' is an uncompressed reader of the blob to be pushed.
// The server will generate it's own checksum calculation. // The server will generate it's own checksum calculation.
func (r *Session) PutV2ImageBlob(imageName, sumType string, blobRdr io.Reader, token []string) (serverChecksum string, err error) { func (r *Session) PutV2ImageBlob(imageName, sumType, sumStr string, blobRdr io.Reader, token []string) (serverChecksum string, err error) {
vars := map[string]string{ vars := map[string]string{
"imagename": imageName, "imagename": imageName,
"sumtype": sumType, "sumtype": sumType,
@ -285,6 +285,7 @@ func (r *Session) PutV2ImageBlob(imageName, sumType string, blobRdr io.Reader, t
return "", err return "", err
} }
setTokenAuth(req, token) setTokenAuth(req, token)
req.Header.Set("X-Tarsum", sumStr)
res, _, err := r.doRequest(req) res, _, err := r.doRequest(req)
if err != nil { if err != nil {
return "", err return "", err
@ -309,6 +310,10 @@ func (r *Session) PutV2ImageBlob(imageName, sumType string, blobRdr io.Reader, t
return "", fmt.Errorf("unable to decode PutV2ImageBlob JSON response: %s", err) return "", fmt.Errorf("unable to decode PutV2ImageBlob JSON response: %s", err)
} }
if sumInfo.Checksum != sumStr {
return "", fmt.Errorf("failed checksum comparison. serverChecksum: %q, localChecksum: %q", sumInfo.Checksum, sumStr)
}
// XXX this is a json struct from the registry, with its checksum // XXX this is a json struct from the registry, with its checksum
return sumInfo.Checksum, nil return sumInfo.Checksum, nil
} }