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

Work harder to reset the state of the docker env on the build worker.

Browse source
This commit is contained in:
jakedt 2014-04-14 15:59:57 -04:00
parent de18236358
commit 40f82a9d16
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
workers/dockerfilebuild.py
View file

@ -125,7 +125,9 @@ class DockerfileBuildContext(object):
(self._repo, self._tag_names)) (self._repo, self._tag_names))
def __enter__(self): def __enter__(self):
self.__cleanup_containers()
self.__evict_expired_images() self.__evict_expired_images()
self.__cleanup()
return self return self
def __exit__(self, exc_type, value, traceback): def __exit__(self, exc_type, value, traceback):
@ -291,8 +293,6 @@ class DockerfileBuildContext(object):
self._build_cl.remove_container(container['Id']) self._build_cl.remove_container(container['Id'])
def __evict_expired_images(self): def __evict_expired_images(self):
self.__cleanup_containers()
logger.debug('Cleaning images older than %s hours.', CACHE_EXPIRATION_PERIOD_HOURS) logger.debug('Cleaning images older than %s hours.', CACHE_EXPIRATION_PERIOD_HOURS)
now = datetime.now() now = datetime.now()
verify_removed = set() verify_removed = set()
@ -333,6 +333,7 @@ class DockerfileBuildContext(object):
self.image_id_to_cache_time[image_id] = now self.image_id_to_cache_time[image_id] = now
for tag in image['RepoTags']: for tag in image['RepoTags']:
# TODO this is slightly wrong, replace it with util/dockerfileparse.py when merged
tag_repo = tag.split(':')[0] tag_repo = tag.split(':')[0]
if tag_repo != '<none>': if tag_repo != '<none>':
if self.__is_repo_public(tag_repo): if self.__is_repo_public(tag_repo):