diff --git a/15.0.Dockerfile b/15.0.Dockerfile index 674654f4188d7e32f57cd4b2ece6ecb08a202c2d..1598b4bed3e7d69415fc4e682590f7b4f08edb59 100644 --- a/15.0.Dockerfile +++ b/15.0.Dockerfile @@ -25,14 +25,14 @@ RUN set -x; \ && curl -o wkhtmltox.deb -SL https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.bullseye_amd64.deb \ && echo 'cecbf5a6abbd68d324a7cd6c51ec843d71e98951 wkhtmltox.deb' | sha1sum -c - \ && apt-get update \ - && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ - && apt-get install -y --no-install-recommends postgresql-client \ - && apt-get -y autoremove \ + && apt-get install --yes --no-install-recommends ./wkhtmltox.deb \ + && apt-get install --yes --no-install-recommends postgresql-client \ + && apt-get --yes autoremove \ && rm -rf /var/lib/apt/lists/* wkhtmltox.deb COPY --from=builder /svc /svc RUN pip3 install --no-index --find-links=/svc/wheels --requirement 'https://raw.githubusercontent.com/oca/OCB/15.0/requirements.txt' \ - && pip3 install --no-index --find-links=/svc/wheels 'phonenumbers' 'simplejson' 'openupgradelib' 'PyYAML' + && pip3 install --upgrade --no-index --find-links=/svc/wheels 'phonenumbers' 'simplejson' 'openupgradelib' 'PyYAML' ARG SAVE_COMMITS_DIR='/opt/odoo_commits/' ENV SAVE_COMMITS_DIR=$SAVE_COMMITS_DIR @@ -63,6 +63,7 @@ RUN set -x; \ COPY --chown=root:root --chmod=755 ./get_addons /usr/local/bin # Install Odoo OCA default dependencies - Commented modules do not exist yet +ARG SAVE_COMMITS_FILENAME='default_addons' RUN set -x; \ get_addons 'https://github.com/OCA/account-financial-reporting' '15.0' 'additional_addons' \ account_tax_balance \