diff --git a/docker_dev_start.py b/docker_dev_start.py index f460e7d11e6c5c8937e4078d1fd3df0e3f67d45e_ZG9ja2VyX2Rldl9zdGFydC5weQ==..36ca479ed9e7b84b08cad98fb6156509971bf428_ZG9ja2VyX2Rldl9zdGFydC5weQ== 100755 --- a/docker_dev_start.py +++ b/docker_dev_start.py @@ -31,7 +31,7 @@ _logger = logging.getLogger(__name__) -__version__ = '1.1.2' +__version__ = '1.1.3' __date__ = '2017-08-11' __updated__ = '2018-07-12' @@ -634,18 +634,8 @@ if odoo_help: arg.append('--help') - if start_postgresql and not odoo_help: - # use docker-py to be able to stop both the database and odoo - # add volumes - odoo_host_config = docker_client.create_host_config( - binds=binds, - port_bindings={8069: 8069}, - network_mode='host' if use_host_network else 'bridge', - ) - logging.debug('Creating odoo container') - odoo = docker_client.create_container( - name=project_name, host_config=odoo_host_config, - image=image, command=arg, tty=True) - logging.debug('Starting odoo container') - docker_client.start(odoo.get('Id')) + # use call to allow usage of pdb + for bind in binds: + options.append('--volume') + options.append(bind) @@ -651,44 +641,11 @@ - def signal_handler(code, frame): - if code == signal.SIGINT: - logging.debug('You pressed Ctrl+C!') - if isRunning(docker_client, odoo.get('Id')): - logging.info('Stopping odoo') - docker_client.stop(odoo.get('Id')) - logging.info('Removing container odoo') - docker_client.remove_container(odoo.get('Id')) - if start_postgresql: - logging.info('Stopping postgresql') - docker_client.stop(pg.get('Id')) - logging.info('Removing container postgresql') - docker_client.remove_container(pg.get('Id')) - sys.exit(0) - # TODO add a kill of pg when crashing - signal.signal(signal.SIGINT, signal_handler) - logging.info('Press Ctrl+C to quit') - - # print docker logs of odoo - for line in docker_client.logs( - odoo.get('Id'), stream=True, follow=True - ): - sys.stdout.write(line) - - # Clean up, just in case - signal_handler(signal.SIGINT, None) - # TODO add handling of signal to restart odoo - else: - # use call to allow usage of pdb - for bind in binds: - options.append('--volume') - options.append(bind) - - cmd = ['docker', 'run'] - cmd.extend(options) - cmd.append(image) - cmd.extend(arg) - logging.debug(' '.join(cmd)) - result = call(cmd) - return result + cmd = ['docker', 'run'] + cmd.extend(options) + cmd.append(image) + cmd.extend(arg) + logging.debug(' '.join(cmd)) + result = call(cmd) + return result def createVolume(docker_client, data_volume_name):