travis2docker 6.4.25__tar.gz → 6.4.27__tar.gz

{travis2docker-6.4.25 → travis2docker-6.4.27}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 6.4.25
+current_version = 6.4.27
 commit = True
 tag = True
 

{travis2docker-6.4.25 → travis2docker-6.4.27}/PKG-INFO

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

{travis2docker-6.4.25 → travis2docker-6.4.27}/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.25'
+version = release = u'6.4.27'
 
 pygments_style = 'trac'
 templates_path = ['.']

{travis2docker-6.4.25 → travis2docker-6.4.27}/setup.py

@@ -13,7 +13,7 @@ def read(*names, **kwargs):
 
 setup(
     name="travis2docker",
-    version="6.4.25",
+    version="6.4.27",
     license="BSD-3-Clause",
     description="Script to generate Dockerfile from .travis.yml file",
     long_description="%s\n%s"

travis2docker-6.4.27/src/travis2docker/__init__.py

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

{travis2docker-6.4.25 → travis2docker-6.4.27}/src/travis2docker/templates/Dockerfile_deployv

@@ -23,6 +23,7 @@ ENV {{ build_env_arg }}=TRUE
 
 # Create cluster with odoo as owner and use environment variables instead of odoo cfg to connect
 RUN . /home/odoo/build.sh && \
+    set_odoo_ids && \
     install_dev_tools && \
     service_postgres_without_sudo odoo odoo && \
     install_pgcli_venv && \

{travis2docker-6.4.25 → travis2docker-6.4.27}/src/travis2docker/templates/build.sh

@@ -46,6 +46,7 @@ odoo_conf(){
     fi
     $ENTRYPOINT run true
     sed -i '/db_host\|db_password\|db_user\|workers\|list_db/d' $ODOO_CONF
+    sed -i 's/\(with_demo\s*=\s*\)False/\1True/' $ODOO_CONF
     su odoo -c "mkdir -p $ODOORC_DATA_DIR"
 }
 
@@ -215,6 +216,27 @@ chown_all(){
     chown -R odoo:odoo /etc/postgresql-common/common-vauxoo.conf
 }
 
+set_odoo_ids(){
+    # OrchestSH images (ORCHESTSH=True) use UID/GID 5410 for the odoo user;
+    # older images use 1000/1001. A mismatch causes permission issues when
+    # sharing files across containers, so align both to 5410 when they differ.
+    CURRENT_UID=$(id -u odoo)
+    CURRENT_GID=$(id -g odoo)
+    NEW_ID=5410
+    if [ "${CURRENT_GID}" != "${NEW_ID}" ]; then
+        echo "Changing odoo GID from ${CURRENT_GID} to ${NEW_ID}"
+        groupmod -g "${NEW_ID}" odoo
+        # groupmod does not re-chown any file
+        find / -xdev -gid "${CURRENT_GID}" -exec chown -h ":${NEW_ID}" {} + 2>/dev/null || true
+    fi
+    if [ "${CURRENT_UID}" != "${NEW_ID}" ]; then
+        echo "Changing odoo UID from ${CURRENT_UID} to ${NEW_ID}"
+        usermod -u "${NEW_ID}" odoo
+        # usermod only re-chowns files inside the home directory
+        find / -xdev -uid "${CURRENT_UID}" -exec chown -h "${NEW_ID}" {} + 2>/dev/null || true
+    fi
+}
+
 configure_vim(){
     git_clone_copy(){
       URL="${1}"

{travis2docker-6.4.25 → travis2docker-6.4.27}/src/travis2docker/templates/entrypoint_deployv.sh

@@ -104,14 +104,6 @@ def start_odoo():
     except subprocess.CalledProcessError:
         database_created = False
 
-    configpy = "/home/odoo/instance/odoo/odoo/tools/config.py"
-    if os.path.isfile(configpy):
-        with open(configpy) as f_configpy:
-            for line in f_configpy:
-                if "--with-demo" in line:
-                    cmd.extend(["--with-demo"])
-                    break
-
     if not database_created:
         cmd.extend(["-i", ",".join(modules), "--workers=0", "--stop-after-init"])
         if test_enable:

{travis2docker-6.4.25 → travis2docker-6.4.27}/src/travis2docker.egg-info/PKG-INFO

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

travis2docker-6.4.25/src/travis2docker/__init__.py

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