diff --git a/docker_dev_start.py b/docker_dev_start.py index cb2b7c4daf2d05f6d268dc50c0bf2447ce70d5d3_ZG9ja2VyX2Rldl9zdGFydC5weQ==..6ca3bf1d203c953839262165cc98c18415b9971c_ZG9ja2VyX2Rldl9zdGFydC5weQ== 100755 --- a/docker_dev_start.py +++ b/docker_dev_start.py @@ -32,5 +32,5 @@ _logger = logging.getLogger(__name__) -__version__ = '1.1.11' +__version__ = '1.1.12' __date__ = '2017-08-11' @@ -36,5 +36,5 @@ __date__ = '2017-08-11' -__updated__ = '2019-01-29' +__updated__ = '2019-06-17' def which(program): @@ -72,6 +72,6 @@ '/mnt']) -def isort(): +def isort(docker_client): """Run isort """ @@ -76,5 +76,7 @@ """Run isort """ + _logger.info('Pulling isort') + docker_client.pull(repository='xcgd/isort', tag='odoo') _logger.info('Running isort') call([ 'docker', 'run', '--rm', '--volume', @@ -78,8 +80,8 @@ _logger.info('Running isort') call([ 'docker', 'run', '--rm', '--volume', - '{}:/mnt'.format(os.environ['PWD']), 'xcgd/isort:odoo', - 'sh', '-c', 'cd /mnt && isort -c']) + '{}:/mnt'.format(os.environ['PWD']), '-w', '/mnt', 'xcgd/isort:odoo', + 'isort', '-c']) def main(argv=None): # IGNORE:C0111 @@ -647,7 +649,7 @@ flake8(odoo_type) if run_isort: - isort() + isort(docker_client) if dev: if odoo_type in ('odoo11', 'odoo10'):