diff --git a/Makefile b/Makefile index ee43a31ca..49d634991 100644 --- a/Makefile +++ b/Makefile @@ -9,10 +9,12 @@ DOCKER_PUSH=$(DOCKERCMD) push DOCKER_IMAGE=$(DOCKERCMD) image DEPLOY_PATH=${PWD}/deployment SETUP_PATH=${PWD}/setup -BRANCH := $(shell git rev-parse --abbrev-ref HEAD) +BRANCH := main HASH := $(shell git rev-parse HEAD) CONFIG=odoo.conf install: + eval "$(pyenv init -)" + eval "$(pyenv virtualenv-init -)" pyenv virtualenv ${BRANCH} pyenv activate ${BRANCH} export DEBIAN_FRONTEND=noninteractive && \ diff --git a/setup/init_env.sh b/setup/init_env.sh index 9e0e84292..87e062771 100755 --- a/setup/init_env.sh +++ b/setup/init_env.sh @@ -8,7 +8,7 @@ ODOO_IMAGE='hub.nextzenos.com/nexterp/odoo' DEPLOY_PATH=$(pwd)/deployment PG_DB=nexterp PG_USER=nexterp -CURRENT_BRANCH=$(git symbolic-ref --short HEAD) +CURRENT_BRANCH=main ODOO_ADDONS=./addons ODOO_CONFIG=./etc # System