From fab6a046bcaaebe54b83bb37f705029c35b5538a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maillard?= Date: Fri, 27 Oct 2017 12:50:29 +0800 Subject: [PATCH] Define Python binary as a constant (prepare for v11) --- Dockerfile | 3 ++- bin/boot | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b40c9899..13512381 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,8 @@ MAINTAINER Elico Corp # Define build constants ENV GIT_BRANCH=8.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 index 1466bbec..2fc9ca6d 100755 --- 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