vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

v2/blob: remove references to docker client

Browse source
This commit is contained in:
Jimmy Zelinskie 2016-08-09 16:06:12 -04:00
parent c77a7bc0b9
commit 419779b9c5
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
endpoints/v2/blob.py
View file

@ -52,11 +52,11 @@ def check_blob_exists(namespace_name, repo_name, digest):
'Content-Type': BLOB_CONTENT_TYPE, 'Content-Type': BLOB_CONTENT_TYPE,
} }
# If our storage supports range requests, let the Docker client know. # If our storage supports range requests, let the client know.
if storage.get_supports_resumable_downloads(blob.locations): if storage.get_supports_resumable_downloads(blob.locations):
headers['Accept-Ranges'] = 'bytes' headers['Accept-Ranges'] = 'bytes'
# Write the response to the Docker client. # Write the response to the client.
return Response(headers=headers) return Response(headers=headers)
@ -75,7 +75,7 @@ def download_blob(namespace_name, repo_name, digest):
# Build the response headers. # Build the response headers.
headers = {'Docker-Content-Digest': digest} headers = {'Docker-Content-Digest': digest}
# If our storage supports range requests, let the Docker client know. # If our storage supports range requests, let the client know.
if storage.get_supports_resumable_downloads(blob.locations): if storage.get_supports_resumable_downloads(blob.locations):
headers['Accept-Ranges'] = 'bytes' headers['Accept-Ranges'] = 'bytes'
@ -94,7 +94,7 @@ def download_blob(namespace_name, repo_name, digest):
# Close the database connection before we stream the download. # Close the database connection before we stream the download.
logger.debug('Closing database connection before streaming layer data') logger.debug('Closing database connection before streaming layer data')
with database.CloseForLongOperation(app.config): with database.CloseForLongOperation(app.config):
# Stream the response to the Docker client. # Stream the response to the client.
return Response( return Response(
storage.stream_read(blob.locations, path), storage.stream_read(blob.locations, path),
headers=headers.update({ headers=headers.update({
@ -150,7 +150,7 @@ def start_blob_upload(namespace_name, repo_name):
# Finalize the upload process in the database and storage. # Finalize the upload process in the database and storage.
_finish_upload(namespace_name, repo_name, updated_blob_upload, digest) _finish_upload(namespace_name, repo_name, updated_blob_upload, digest)
# Write the response to the docker client. # Write the response to the client.
return Response( return Response(
status=201, status=201,
headers={ headers={
@ -175,7 +175,7 @@ def fetch_existing_upload(namespace_name, repo_name, upload_uuid):
status=204, status=204,
headers={ headers={
'Docker-Upload-UUID': upload_uuid, 'Docker-Upload-UUID': upload_uuid,
'Range': _render_range(blob_upload.byte_count+1), # Docker byte ranges are exclusive 'Range': _render_range(blob_upload.byte_count+1), # byte ranges are exclusive
}, },
) )
@ -200,7 +200,7 @@ def upload_chunk(namespace_name, repo_name, upload_uuid):
# Save the upload state to the database. # Save the upload state to the database.
v2.update_blob_upload(updated_blob_upload) v2.update_blob_upload(updated_blob_upload)
# Write the response to the Docker client. # Write the response to the client.
return Response( return Response(
status=204, status=204,
headers={ headers={
@ -236,7 +236,7 @@ def monolithic_upload_or_last_chunk(namespace_name, repo_name, upload_uuid):
# Finalize the upload process in the database and storage. # Finalize the upload process in the database and storage.
_finish_upload(namespace_name, repo_name, updated_blob_upload, digest) _finish_upload(namespace_name, repo_name, updated_blob_upload, digest)
# Write the response to the Docker client. # Write the response to the client.
return Response( return Response(
status=201, status=201,
headers={ headers={
@ -387,7 +387,7 @@ def _upload_chunk(blob_upload, range_header):
# If this is the first chunk and we're starting at the 0 offset, add a handler to gunzip the # If this is the first chunk and we're starting at the 0 offset, add a handler to gunzip the
# stream so we can determine the uncompressed size. We'll throw out this data if another chunk # stream so we can determine the uncompressed size. We'll throw out this data if another chunk
# comes in, but in the common case Docker only sends one chunk. # comes in, but in the common case the docker client only sends one chunk.
size_info = None size_info = None
if start_offset == 0 and blob_upload.chunk_count == 0: if start_offset == 0 and blob_upload.chunk_count == 0:
size_info, fn = calculate_size_handler() size_info, fn = calculate_size_handler()