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

Make the data block returned by the server mirror that of the build server. Make the UI respond to the new status format for pushing.

Browse source
This commit is contained in:
yackob03 2014-01-02 14:13:16 -05:00
parent 8981f576fc
commit 06e03b1260
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
buildserver/buildserver.py
View file

@ -136,7 +136,7 @@ MIME_PROCESSORS = {
'application/octet-stream': prepare_dockerfile, 'application/octet-stream': prepare_dockerfile,
} }
# If this format it should also be changed in the api method get_repo_builds
build = { build = {
'total_commands': None, 'total_commands': None,
'current_command': None, 'current_command': None,

6
endpoints/api.py
View file

@ -874,15 +874,15 @@ def get_repo_builds(namespace, repository):
return node_status return node_status
# If there was no status url, do the best we can # If there was no status url, do the best we can
# The format of this block should mirror that of the buildserver.
return { return {
'id': build_obj.id, 'id': build_obj.id,
'total_commands': None, 'total_commands': None,
'total_images': None,
'current_command': None, 'current_command': None,
'current_image': None, 'push_completion': 0.0,
'image_completion_percent': None,
'status': build_obj.phase, 'status': build_obj.phase,
'message': None, 'message': None,
'image_completion': {},
} }
builds = model.list_repository_builds(namespace, repository) builds = model.list_repository_builds(namespace, repository)

3
static/js/app.js
View file

@ -2030,8 +2030,7 @@ quayApp.directive('buildStatus', function () {
break; break;
case 'pushing': case 'pushing':
var imagePercentDecimal = (buildInfo.image_completion_percent / 100); return buildInfo.push_completion * 100;
return ((buildInfo.current_image + imagePercentDecimal) / buildInfo.total_images) * 100;
break; break;
case 'complete': case 'complete':