diff --git a/17.0/base_requirements.txt b/17.0/base_requirements.txt index f4ca5f4d..8abb7d59 100644 --- a/17.0/base_requirements.txt +++ b/17.0/base_requirements.txt @@ -2,7 +2,7 @@ # colorama==0.3.9 gdata==2.0.18 lxml-html-clean==0.4.1 - +whool==1.2 # Migration tools #marabunta==0.12.0 diff --git a/build.sh b/build.sh index 852c82ab..0e310376 100755 --- a/build.sh +++ b/build.sh @@ -36,4 +36,4 @@ cp -r install/ ${TMP} cp -r start-entrypoint.d/ ${TMP} cp -r before-migrate-entrypoint.d/ ${TMP} -docker build --no-cache -f ${TMP}/Dockerfile -t ${BUILD_TAG} ${TMP} +docker build --progress plain --no-cache -f ${TMP}/Dockerfile -t ${BUILD_TAG} ${TMP} diff --git a/example/Dockerfile b/example/Dockerfile index 2b38b711..d010a6f4 100644 --- a/example/Dockerfile +++ b/example/Dockerfile @@ -27,8 +27,8 @@ RUN set -x; \ USER odoo WORKDIR /odoo # run in a virtualenv - -RUN pip install --user -e . +RUN /odoo/.venv/bin/pip install --user -r /odoo/src/odoo/requirements.txt +RUN /odoo/.venv/bin/pip install --user -e . #RUN pip install --user -r requirements.txt # Project's specifics packages