Fix #3281: Unexpected result when using build args with default values
Fix the issue when build arg is set to None instead of empty string. Usecase: cat docker-compose.yml .... args: - http_proxy - https_proxy - no_proxy If http_proxy, https_proxy, no_proxy environment variables are not defined then http_proxy, https_proxy, no_proxy build args will be set to string None which breaks all downloads With this change undefined build args will be set to empty string instead of string None Signed-off-by: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
This commit is contained in:
parent
e3e8a619cc
commit
c148849f0e
4 changed files with 5 additions and 37 deletions
|
|
@ -445,7 +445,7 @@ class ServiceTest(unittest.TestCase):
|
|||
forcerm=False,
|
||||
nocache=False,
|
||||
rm=True,
|
||||
buildargs={},
|
||||
buildargs=None,
|
||||
)
|
||||
|
||||
def test_ensure_image_exists_no_build(self):
|
||||
|
|
@ -481,33 +481,7 @@ class ServiceTest(unittest.TestCase):
|
|||
forcerm=False,
|
||||
nocache=False,
|
||||
rm=True,
|
||||
buildargs={},
|
||||
)
|
||||
|
||||
def test_ensure_filter_out_empty_build_args(self):
|
||||
args = {u'no_proxy': 'None', u'https_proxy': 'something'}
|
||||
service = Service('foo',
|
||||
client=self.mock_client,
|
||||
build={'context': '.', 'args': args})
|
||||
self.mock_client.inspect_image.return_value = {'Id': 'abc123'}
|
||||
self.mock_client.build.return_value = [
|
||||
'{"stream": "Successfully built abcd"}',
|
||||
]
|
||||
|
||||
with mock.patch('compose.service.log', autospec=True) as mock_log:
|
||||
service.ensure_image_exists(do_build=BuildAction.force)
|
||||
|
||||
assert not mock_log.warn.called
|
||||
self.mock_client.build.assert_called_once_with(
|
||||
tag='default_foo',
|
||||
dockerfile=None,
|
||||
stream=True,
|
||||
path='.',
|
||||
pull=False,
|
||||
forcerm=False,
|
||||
nocache=False,
|
||||
rm=True,
|
||||
buildargs={u'https_proxy': 'something'},
|
||||
buildargs=None,
|
||||
)
|
||||
|
||||
def test_build_does_not_pull(self):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue