travis2docker 6.4.18__tar.gz → 6.4.20__tar.gz

{travis2docker-6.4.18 → travis2docker-6.4.20}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 6.4.18
+current_version = 6.4.20
 commit = True
 tag = True
 

{travis2docker-6.4.18 → travis2docker-6.4.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: travis2docker
-Version: 6.4.18
+Version: 6.4.20
 Summary: Script to generate Dockerfile from .travis.yml file
 Home-page: https://github.com/vauxoo/travis2docker
 Author: Vauxoo

{travis2docker-6.4.18 → travis2docker-6.4.20}/docs/conf.py

@@ -26,7 +26,7 @@ project = u'travis2docker'
 year = '2016'
 author = u'Vauxoo'
 copyright = '{0}, {1}'.format(year, author)
-version = release = u'6.4.18'
+version = release = u'6.4.20'
 
 pygments_style = 'trac'
 templates_path = ['.']

{travis2docker-6.4.18 → travis2docker-6.4.20}/setup.py

@@ -15,7 +15,7 @@ def read(*names, **kwargs):
 
 setup(
     name='travis2docker',
-    version='6.4.18',
+    version='6.4.20',
     license='BSD',
     description='Script to generate Dockerfile from .travis.yml file',
     long_description='%s\n%s'

travis2docker-6.4.20/src/travis2docker/__init__.py

@@ -0,0 +1 @@
+__version__ = "6.4.20"

{travis2docker-6.4.18 → travis2docker-6.4.20}/src/travis2docker/cli.py

@@ -42,11 +42,12 @@ def get_git_data(project, path, revision):
 
 def yml_read(yml_path):
     yml_path_expanded = expandvars(expanduser(yml_path))
+    alt_yml_path_expanded = None
     if isdir(yml_path_expanded):
         yml_path_expanded = join(yml_path_expanded, '.travis.yml')
         alt_yml_path_expanded = join(yml_path_expanded, '.t2d.yml')
     if not isfile(yml_path_expanded):
-        if isfile(alt_yml_path_expanded):
+        if alt_yml_path_expanded and isfile(alt_yml_path_expanded):
             yml_path_expanded = alt_yml_path_expanded
         else:
             return

{travis2docker-6.4.18 → travis2docker-6.4.20}/src/travis2docker/templates/Dockerfile_deployv

@@ -34,9 +34,10 @@ RUN . /home/odoo/build.sh && \
     configure_vim && \
     configure_zsh && \
     chown_all && \
-    mv /entrypoint_image /deployv_entrypoint_image && \
-    mv /entry_point.py /deployv_entry_point.py && \
-    mkdir /run/sshd
+    [ -e /entrypoint_image ] && mv /entrypoint_image /deployv_entrypoint_image ; \
+    [ -e /entry_point.py ] && mv /entry_point.py /deployv_entry_point.py ; \
+    [ -e /entrypoint ] && mv /entrypoint /deployv_entrypoint ; \
+    mkdir -p /run/sshd
 
 {% for step in build_extra_steps %}
 RUN {{ step }}

{travis2docker-6.4.18 → travis2docker-6.4.20}/src/travis2docker/templates/build.sh

@@ -28,8 +28,23 @@ install_pgcli_venv(){
 }
 
 odoo_conf(){
-    export ODOO_CONF=/home/odoo/.openerp_serverrc
-    /entry_point.py run true
+    if [ -f "/home/odoo/.odoorc" ]; then
+        export ODOO_CONF="/home/odoo/.odoorc"
+    elif [ -f "/home/odoo/.openerp_serverrc" ]; then
+        export ODOO_CONF="/home/odoo/.openerp_serverrc"
+    else
+        echo "❌ Odoo configuration file not found."
+        exit 1
+    fi
+    if [ -x "/entrypoint" ]; then
+        export ENTRYPOINT="/entrypoint"
+    elif [ -x "/entry_point.py" ]; then
+        export ENTRYPOINT="/entry_point.py"
+    else
+        echo "❌ Orchest entrypoint not found"
+        exit 1
+    fi
+    $ENTRYPOINT run true
     sed -i '/db_host\|db_password\|db_user\|workers\|list_db/d' $ODOO_CONF
     su odoo -c "mkdir -p $ODOORC_DATA_DIR"
 }

{travis2docker-6.4.18 → travis2docker-6.4.20}/src/travis2docker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: travis2docker
-Version: 6.4.18
+Version: 6.4.20
 Summary: Script to generate Dockerfile from .travis.yml file
 Home-page: https://github.com/vauxoo/travis2docker
 Author: Vauxoo

travis2docker-6.4.18/src/travis2docker/__init__.py

@@ -1 +0,0 @@
-__version__ = "6.4.18"