Merge branch '8.0.2.0' of github.com:Elico-Corp/odoo-docker into 9.0.2.0

Elico-Corp · Oct 27, 2017 · 42dcf74 · 42dcf74
2 parents 654fc2c + fab6a04
commit 42dcf74
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,8 @@ MAINTAINER Elico Corp <[email protected]>
 
 # Define build constants
 ENV GIT_BRANCH=9.0 \
-  BINARY_NAME=openerp-server
+  PYTHON_BIN=python \
+  SERVICE_BIN=openerp-server
 
 # Set timezone to UTC
 RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime

diff --git a/bin/boot b/bin/boot
@@ -192,8 +192,8 @@ function start {
     if [ ! -e $1 ]; then
         echo $log_src[`date +%F.%H:%M:%S`]' ...with additional args:' $*
     fi
-    sudo -i -u "$odoo_user" python \
-        "/opt/odoo/sources/odoo/$BINARY_NAME" -c "$odoo_conf_file" $*
+    sudo -i -u "$odoo_user" "$PYTHON_BIN" \
+        "/opt/odoo/sources/odoo/$SERVICE_BIN" -c "$odoo_conf_file" $*
 }
 
 # Run command