mathben/erplibre
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

[FIX] docker: update poetry into docker

Browse source
This commit is contained in:
Mathieu Benoit 2023-01-02 01:20:09 -05:00
parent a4c48d5ae5
commit 7ddefe4d2a
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
docker/Dockerfile.prod.pkg
View file

@ -22,6 +22,8 @@ RUN cd ; mkdir -p .bin/ && \
git config --global user.name "Foo Bar" && \ 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 && \ 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 && \ cd $ODOO_PREFIX && \
# fatal: detected dubious ownership in repository at '/ERPLibre'
git config --global --add safe.directory /ERPLibre && \
git checkout $COMMIT_ERPLIBRE git checkout $COMMIT_ERPLIBRE
RUN cd $ODOO_PREFIX && \ RUN cd $ODOO_PREFIX && \
@ -35,15 +37,13 @@ RUN cd $ODOO_PREFIX && \
./script/update_manifest_dev.sh ./script/update_manifest_dev.sh
# Install Poetry # 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 && \ RUN cd $ODOO_PREFIX && \
./.venv/bin/pip install --upgrade pip && \ ./.venv/bin/pip install --upgrade pip && \
./.venv/bin/python ~/.poetry/bin/poetry install && \ ./.venv/bin/pip install vatnumber && \
rm -rf artifacts && \ ./.venv/bin/pip install suds-jurko && \
rm -rf ~/.poetry ./.venv/bin/pip install poetry==1.3.1 && \
./.venv/bin/poetry --version && \
./.venv/bin/poetry install
RUN cd $ODOO_PREFIX/.venv && \ RUN cd $ODOO_PREFIX/.venv && \
curl https://raw.githubusercontent.com/ERPLibre/multilingual-markdown/master/multilang_md.py > ./multilang_md.py && \ curl https://raw.githubusercontent.com/ERPLibre/multilingual-markdown/master/multilang_md.py > ./multilang_md.py && \

4
script/install_locally.sh
View file

@ -124,10 +124,8 @@ if [[ ! -f "${POETRY_PATH}" ]]; then
echo "Poetry installation error." echo "Poetry installation error."
exit 1 exit 1
fi fi
# Fix broken poetry by installing ignored dependence
${VENV_PATH}/bin/pip install vatnumber
${VENV_PATH}/bin/pip install suds-jurko
fi fi
# Fix broken poetry by installing ignored dependence
${VENV_PATH}/bin/pip install vatnumber ${VENV_PATH}/bin/pip install vatnumber
${VENV_PATH}/bin/pip install suds-jurko ${VENV_PATH}/bin/pip install suds-jurko