Commit 7cc16f2c authored by Tulio Ruiz's avatar Tulio Ruiz
Browse files

Merge branch 'master-fix_country_var-truiz' into 'master'

Master fix country var truiz

See merge request !21
parents 684624ae 847b2fe2
Pipeline #7223 passed with stage
in 34 seconds
[bumpversion]
current_version = 0.1.4
current_version = 0.1.6
commit = True
tag = False
......
......@@ -24,9 +24,9 @@ Overview
:alt: PyPI Package latest release
:target: https://pypi.python.org/pypi/deployv-addon-gitlab-tools
.. |commits-since| image:: https://img.shields.io/github/commits-since/Vauxoo/deployv-addon-gitlab-tools/v0.1.4.svg
.. |commits-since| image:: https://img.shields.io/github/commits-since/Vauxoo/deployv-addon-gitlab-tools/v0.1.6.svg
:alt: Commits since latest release
:target: https://github.com/Vauxoo/deployv-addon-gitlab-tools/compare/v0.1.4...master
:target: https://github.com/Vauxoo/deployv-addon-gitlab-tools/compare/v0.1.6...master
.. |downloads| image:: https://img.shields.io/pypi/dm/deployv-addon-gitlab-tools.svg
:alt: PyPI Package monthly downloads
......
......@@ -26,7 +26,7 @@ project = u'Deployv addon: Gitlab tools'
year = '2017'
author = u'Vauxoo'
copyright = '{0}, {1}'.format(year, author)
version = release = u'0.1.4'
version = release = u'0.1.6'
pygments_style = 'trac'
templates_path = ['.']
......
......@@ -74,7 +74,7 @@ class PyInstall(InstallCommand):
setup(
name='deployv-addon-gitlab-tools',
version='0.1.5',
version='0.1.6',
license='BSD',
description='Deployv addon: Gitlab tools. Generated by cookiecutter and cookiecutter-deploy-addon.',
long_description='%s\n%s' % (
......
......@@ -6,7 +6,7 @@ from deployv_addon_gitlab_tools.commands import (
check_keys, test_images, upload_image, deployv_tests
)
__version__ = "0.1.4"
__version__ = "0.1.6"
logger = logging.getLogger('deployv.' + __name__) # pylint: disable=C0103
......
......@@ -11,6 +11,7 @@ import shlex
import sys
import click
import logging
import json
logger = logging.getLogger('deployv.' + __name__) # pylint: disable=C0103
......@@ -87,13 +88,13 @@ def start_instance():
"ODOO_CONFIG_FILE": "/home/odoo/.openerp_serverrc"
}
for env_var in ['COUNTRY', 'LANGUAGE']:
if environ.get(env_var):
env.update({env_var: environ.get(env_var)})
env.update({env_var: environ.get(env_var, "")})
links = {
postgres_container(): postgres_container()
}
host_config = _cli.create_host_config(links=links)
logger.info('Starting container %s', environ['_INSTANCE_IMAGE'])
logger.debug('Env vars %s', json.dumps(env, sort_keys=True, indent=4))
container = _cli.create_container(image=environ['_INSTANCE_IMAGE'],
name=environ['_INSTANCE_IMAGE'],
environment=env,
......@@ -120,9 +121,11 @@ def install_module():
logger.info('Stopping odoo')
exec_cmd(environ['_INSTANCE_IMAGE'], 'supervisorctl stop odoo')
logger.info('\nInstalling %s with demo', module)
logger.debug('Command : %s', install_wdemo)
wdemo_res = exec_cmd(environ['_INSTANCE_IMAGE'], install_wdemo, 'odoo', stream=True)
wdemo_log = resume_log(wdemo_res)
logger.info('\nInstalling %s without demo', module)
logger.debug('Command : %s', install_wodemo)
wodemo_res = exec_cmd(environ['_INSTANCE_IMAGE'], install_wodemo, 'odoo', stream=True)
wodemo_log = resume_log(wodemo_res)
show_log(wdemo_log[1], 'Installation with demo')
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment