openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Implement post-upload cleanup of docker images"

This commit is contained in:
Zuul 2017-12-06 22:20:25 +00:00 committed by Gerrit Code Review
parent 0b48099171 7e0564106e
commit 3c92369e5c
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tripleo_common/image/image_uploader.py
View File

@ -21,6 +21,7 @@ import netifaces
import six
import time
import docker
try:
from docker import APIClient as Client
except ImportError:
@ -76,6 +77,11 @@ class ImageUploadManager(BaseImageManager):
self.uploader(uploader).upload_image(
image_name, pull_source, push_destination)
# Do cleanup after all the uploads so common layers don't get deleted
# repeatedly
for uploader in self.uploaders.values():
uploader.cleanup()
return upload_images # simply to make test validation easier
def get_ctrl_plane_ip(self):
@ -107,12 +113,20 @@ class ImageUploader(object):
"""Discover a versioned tag for an image"""
pass
@abc.abstractmethod
def cleanup(self):
"""Remove unused images or temporary files from upload"""
pass
class DockerImageUploader(ImageUploader):
"""Upload images using docker push"""
logger = logging.getLogger(__name__ + '.DockerImageUploader')
def __init__(self):
self.local_images = set()
def upload_image(self, image_name, pull_source, push_destination):
dockerc = Client(base_url='unix://var/run/docker.sock', version='auto')
if ':' in image_name:
@ -129,13 +143,16 @@ class DockerImageUploader(ImageUploader):
self._pull_retry(dockerc, repo, tag=tag)
full_image = repo + ':' + tag
self.local_images.add(full_image)
new_repo = push_destination + '/' + repo.partition('/')[2]
full_new_repo = new_repo + ':' + tag
response = dockerc.tag(image=full_image, repository=new_repo,
tag=tag, force=True)
self.logger.debug(response)
response = [line for line in dockerc.push(new_repo,
tag=tag, stream=True)]
self.local_images.add(full_new_repo)
self.logger.debug(response)
self.logger.info('Completed upload for docker image %s' % image_name)
@ -196,3 +213,17 @@ class DockerImageUploader(ImageUploader):
versioned_image = '%s:%s' % (image_name, tag_label)
self._pull_retry(dockerc, versioned_image)
return tag_label
def cleanup(self):
dockerc = Client(base_url='unix://var/run/docker.sock', version='auto')
for image in sorted(self.local_images):
self.logger.info('Removing local copy of %s' % image)
try:
dockerc.remove_image(image)
except docker.errors.APIError as e:
if e.explanation:
self.logger.warning(e.explanation)
else:
self.logger.warning(e)
self.local_images.clear()

21
tripleo_common/tests/image/test_image_uploader.py
View File

@ -63,6 +63,27 @@ class TestImageUploadManager(base.TestCase):
key=operator.itemgetter('imagename'))
self.assertEqual(sorted_expected_data, sorted_parsed_data)
dockerc = mockdocker.return_value
dockerc.remove_image.assert_has_calls([
mock.call('docker.io/tripleoupstream'
'/centos-binary-nova-compute:liberty'),
mock.call('docker.io/tripleoupstream'
'/centos-binary-nova-libvirt:liberty'),
mock.call('docker.io/tripleoupstream'
'/heat-docker-agents-centos:latest'),
mock.call('docker.io/tripleoupstream'
'/image-with-missing-tag:latest'),
mock.call('localhost:8787/tripleoupstream'
'/centos-binary-nova-compute:liberty'),
mock.call('localhost:8787/tripleoupstream'
'/centos-binary-nova-libvirt:liberty'),
mock.call('localhost:8787/tripleoupstream'
'/heat-docker-agents-centos:latest'),
mock.call('localhost:8787/tripleoupstream/'
'image-with-missing-tag:latest'),
])
class TestImageUploader(base.TestCase):