Remove deprecated docker.py insecure_registy argument
Change-Id: I8c700da4d2bbf5fb7094fef522f2331ae2f42f43 Closes-Bug: #1696687
This commit is contained in:
parent
414f94b6c1
commit
92f51c22ea
@ -103,7 +103,7 @@ class DockerImageUploader(ImageUploader):
|
|||||||
repo = pull_source + '/' + image
|
repo = pull_source + '/' + image
|
||||||
|
|
||||||
response = [line for line in dockerc.pull(repo,
|
response = [line for line in dockerc.pull(repo,
|
||||||
tag=tag, stream=True, insecure_registry=True)]
|
tag=tag, stream=True)]
|
||||||
self.logger.debug(response)
|
self.logger.debug(response)
|
||||||
|
|
||||||
full_image = repo + ':' + tag
|
full_image = repo + ':' + tag
|
||||||
@ -113,7 +113,7 @@ class DockerImageUploader(ImageUploader):
|
|||||||
self.logger.debug(response)
|
self.logger.debug(response)
|
||||||
|
|
||||||
response = [line for line in dockerc.push(new_repo,
|
response = [line for line in dockerc.push(new_repo,
|
||||||
tag=tag, stream=True, insecure_registry=True)]
|
tag=tag, stream=True)]
|
||||||
self.logger.debug(response)
|
self.logger.debug(response)
|
||||||
|
|
||||||
self.logger.info('Completed upload for docker image %s' % image_name)
|
self.logger.info('Completed upload for docker image %s' % image_name)
|
||||||
|
@ -141,14 +141,14 @@ class TestDockerImageUploader(base.TestCase):
|
|||||||
|
|
||||||
self.dockermock.return_value.pull.assert_called_once_with(
|
self.dockermock.return_value.pull.assert_called_once_with(
|
||||||
pull_source + '/' + image,
|
pull_source + '/' + image,
|
||||||
tag=tag, stream=True, insecure_registry=True)
|
tag=tag, stream=True)
|
||||||
self.dockermock.return_value.tag.assert_called_once_with(
|
self.dockermock.return_value.tag.assert_called_once_with(
|
||||||
image=pull_source + '/' + image + ':' + tag,
|
image=pull_source + '/' + image + ':' + tag,
|
||||||
repository=push_destination + '/' + image,
|
repository=push_destination + '/' + image,
|
||||||
tag=tag, force=True)
|
tag=tag, force=True)
|
||||||
self.dockermock.return_value.push(
|
self.dockermock.return_value.push(
|
||||||
push_destination + '/' + image,
|
push_destination + '/' + image,
|
||||||
tag=tag, stream=True, insecure_registry=True)
|
tag=tag, stream=True)
|
||||||
|
|
||||||
def test_upload_image_missing_tag(self):
|
def test_upload_image_missing_tag(self):
|
||||||
image = 'tripleoupstream/heat-docker-agents-centos'
|
image = 'tripleoupstream/heat-docker-agents-centos'
|
||||||
@ -165,11 +165,11 @@ class TestDockerImageUploader(base.TestCase):
|
|||||||
|
|
||||||
self.dockermock.return_value.pull.assert_called_once_with(
|
self.dockermock.return_value.pull.assert_called_once_with(
|
||||||
pull_source + '/' + image,
|
pull_source + '/' + image,
|
||||||
tag=expected_tag, stream=True, insecure_registry=True)
|
tag=expected_tag, stream=True)
|
||||||
self.dockermock.return_value.tag.assert_called_once_with(
|
self.dockermock.return_value.tag.assert_called_once_with(
|
||||||
image=pull_source + '/' + image + ':' + expected_tag,
|
image=pull_source + '/' + image + ':' + expected_tag,
|
||||||
repository=push_destination + '/' + image,
|
repository=push_destination + '/' + image,
|
||||||
tag=expected_tag, force=True)
|
tag=expected_tag, force=True)
|
||||||
self.dockermock.return_value.push(
|
self.dockermock.return_value.push(
|
||||||
push_destination + '/' + image,
|
push_destination + '/' + image,
|
||||||
tag=expected_tag, stream=True, insecure_registry=True)
|
tag=expected_tag, stream=True)
|
||||||
|
Loading…
Reference in New Issue
Block a user