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

Change back to using a docker load format

Browse source
This commit is contained in:
Joseph Schorr 2014-09-19 12:22:54 -04:00
parent 99d57752f5
commit e273dca4b4
4 changed files with 160 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

22
endpoints/verbs.py
View file

@ -1,5 +1,6 @@
import logging
import json
import hashlib
from flask import redirect, Blueprint, abort, send_file
@ -12,14 +13,18 @@ from data import database
from util.queuefile import QueueFile
from util.queueprocess import QueueProcess
from util.gzipwrap import GzipWrap
from util.streamlayerformat import StreamLayerMerger
from util.dockerloadformat import build_docker_load_stream
verbs = Blueprint('verbs', __name__)
logger = logging.getLogger(__name__)
def _open_stream(namespace, repository, image_list):
def _open_stream(namespace, repository, tag, synthetic_image_id, image_json, image_list):
def get_next_image():
for current_image_id in image_list:
yield model.get_repo_image(namespace, repository, current_image_id)
def get_next_layer():
for current_image_id in image_list:
current_image_entry = model.get_repo_image(namespace, repository, current_image_id)
@ -31,7 +36,9 @@ def _open_stream(namespace, repository, image_list):
yield current_image_stream
database.configure(app.config)
stream = GzipWrap(StreamLayerMerger(get_next_layer).get_generator())
stream = build_docker_load_stream(namespace, repository, tag, synthetic_image_id, image_json,
get_next_image, get_next_layer)
return stream.read
@ -80,9 +87,16 @@ def get_squashed_tag(namespace, repository, tag):
ancestry_data = store.get_content(repo_image.storage.locations, store.image_ancestry_path(uuid))
full_image_list = json.loads(ancestry_data)
# Load the image's JSON layer.
image_json_data = store.get_content(repo_image.storage.locations, store.image_json_path(uuid))
image_json = json.loads(image_json_data)
# Calculate a synthetic image ID.
synthetic_image_id = hashlib.sha256(tag_image.docker_image_id + ':squash').hexdigest()
# Create a queue process to generate the data. The queue files will read from the process
# and send the results to the client and storage.
args = (namespace, repository, full_image_list)
args = (namespace, repository, tag, synthetic_image_id, image_json, full_image_list)
queue_process = QueueProcess(_open_stream, 8 * 1024, 10 * 1024 * 1024, args) # 8K/10M chunk/max
client_queue_file = QueueFile(queue_process.create_queue(), 'client')