diff --git a/docker/Dockerfile.prod.pkg b/docker/Dockerfile.prod.pkg index 44cf992..c9beecb 100644 --- a/docker/Dockerfile.prod.pkg +++ b/docker/Dockerfile.prod.pkg @@ -22,6 +22,8 @@ RUN cd ; mkdir -p .bin/ && \ git config --global user.name "Foo Bar" && \ if [ "$BRANCH_ERPLIBRE" = "HEAD" ]; then git clone $REPO_MANIFEST_URL $ODOO_PREFIX ; else git clone $REPO_MANIFEST_URL -b $BRANCH_ERPLIBRE $ODOO_PREFIX; fi && \ cd $ODOO_PREFIX && \ + # fatal: detected dubious ownership in repository at '/ERPLibre' + git config --global --add safe.directory /ERPLibre && \ git checkout $COMMIT_ERPLIBRE RUN cd $ODOO_PREFIX && \ @@ -35,15 +37,13 @@ RUN cd $ODOO_PREFIX && \ ./script/update_manifest_dev.sh # Install Poetry -RUN cd $ODOO_PREFIX && \ - curl -sSL -o get-poetry.py https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py && \ - ./.venv/bin/python get-poetry.py -y --preview --version 1.1.14 - RUN cd $ODOO_PREFIX && \ ./.venv/bin/pip install --upgrade pip && \ - ./.venv/bin/python ~/.poetry/bin/poetry install && \ - rm -rf artifacts && \ - rm -rf ~/.poetry + ./.venv/bin/pip install vatnumber && \ + ./.venv/bin/pip install suds-jurko && \ + ./.venv/bin/pip install poetry==1.3.1 && \ + ./.venv/bin/poetry --version && \ + ./.venv/bin/poetry install RUN cd $ODOO_PREFIX/.venv && \ curl https://raw.githubusercontent.com/ERPLibre/multilingual-markdown/master/multilang_md.py > ./multilang_md.py && \ diff --git a/script/install_locally.sh b/script/install_locally.sh index 71087fa..773771d 100755 --- a/script/install_locally.sh +++ b/script/install_locally.sh @@ -124,10 +124,8 @@ if [[ ! -f "${POETRY_PATH}" ]]; then echo "Poetry installation error." exit 1 fi - # Fix broken poetry by installing ignored dependence - ${VENV_PATH}/bin/pip install vatnumber - ${VENV_PATH}/bin/pip install suds-jurko fi +# Fix broken poetry by installing ignored dependence ${VENV_PATH}/bin/pip install vatnumber ${VENV_PATH}/bin/pip install suds-jurko