From 38a46e8f5032078279ee097989a03a4e1d548fcb Mon Sep 17 00:00:00 2001 From: msneddon Date: Mon, 26 Jun 2017 13:41:09 -0700 Subject: [PATCH 1/2] readme update --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 053bf8e..9cf4829 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,10 @@ develop: [![Build Status](https://travis-ci.org/kbase/catalog.svg?branch=develop Code coverage: (develop branch) [![Coverage Status](https://coveralls.io/repos/github/kbase/catalog/badge.svg?branch=develop)](https://coveralls.io/github/kbase/catalog?branch=develop) + +#### v2.1.1 - 6/26/17 + - Bugfix for change in docker build log + #### v2.1.0 - 4/13/17 - No change from 2.0.7, but upgraded minor version number because many new features now exist since the initial 2.0.x release. From 31eac63e28d2142feb670dea521c97f75cced1be Mon Sep 17 00:00:00 2001 From: msneddon Date: Mon, 26 Jun 2017 13:58:08 -0700 Subject: [PATCH 2/2] remove unnecessary check for the last log message in a docker build --- lib/biokbase/catalog/registrar.py | 32 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/lib/biokbase/catalog/registrar.py b/lib/biokbase/catalog/registrar.py index fe179d3..ee84e10 100644 --- a/lib/biokbase/catalog/registrar.py +++ b/lib/biokbase/catalog/registrar.py @@ -542,35 +542,31 @@ def cleanup(self): shutil.rmtree(os.path.join(self.temp_dir,self.registration_id)) def build_docker_image(self, docker_client, image_name, basedir): - self.log('\nBuilding the docker image for ' + image_name); + self.log('\nBuilding the docker image for ' + image_name) # examine stream to determine success/failure of build - imageId=None - last={} - for lines in docker_client.build(path=basedir,rm=True,tag=image_name, pull=False): + imageId = None + for lines in docker_client.build(path=basedir, rm=True, tag=image_name, pull=False): for line in lines.strip().splitlines(): line_parse = json.loads(line.strip()) - log_line = '' if 'stream' in line_parse: - self.log(line_parse['stream'],no_end_line=True) + self.log(line_parse['stream'], no_end_line=True) if 'errorDetail' in line_parse: - self.log(str(line_parse),no_end_line=True) - raise ValueError('Docker build failed: '+str(line_parse['errorDetail'])) - last=line_parse - - if 'stream' in last and last['stream'][:19]=='Successfully built ': - imageId = docker_client.inspect_image(image_name)['Id'] + self.log(str(line_parse), no_end_line=True) + raise ValueError('Docker build failed: ' + str(line_parse['errorDetail'])) + + imageId = docker_client.inspect_image(image_name)['Id'] self.log('Docker build successful.') - self.log(' Image Id: ' + imageId) - self.log(' Image Name: ' + image_name+'\n\n') + self.log(' Image Id: ' + str(imageId)) + self.log(' Image Name: ' + str(image_name) + '\n\n') return imageId def push_docker_image(self, docker_client, image_name): - self.log('\nPushing docker image to registry for ' + image_name); - colon_pos = image_name.rfind(':') # This logic supports images with "host:port/" prefix for private registry - image=image_name[:colon_pos] - tag=image_name[colon_pos+1:] + self.log('\nPushing docker image to registry for ' + image_name) + colon_pos = image_name.rfind(':') # This logic supports images with "host:port/" prefix for private registry + image = image_name[:colon_pos] + tag = image_name[colon_pos + 1:] #response = [ line for line in docker_client.push(image, tag=tag, stream=True) ] #response_stream = response #self.log(str(response_stream))