diff --git a/10.0/Dockerfile b/10.0/Dockerfile index 5dbebc8..cbf8be0 100644 --- a/10.0/Dockerfile +++ b/10.0/Dockerfile @@ -16,8 +16,8 @@ RUN set -x; \ python-support \ python-vobject \ python-watchdog \ - && curl -o wkhtmltox.deb -SL http://nightly.odoo.com/extra/wkhtmltox-0.12.1.2_linux-jessie-amd64.deb \ - && echo '40e8b906de658a2221b15e4e8cd82565a47d7ee8 wkhtmltox.deb' | sha1sum -c - \ + && curl -o wkhtmltox.deb -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.jessie_amd64.deb \ + && echo '4d104ff338dc2d2083457b3b1e9baab8ddf14202 wkhtmltox.deb' | sha1sum -c - \ && dpkg --force-depends -i wkhtmltox.deb \ && apt-get -y install -f --no-install-recommends \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false npm \ diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 3eb1d19..dea09d4 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -20,12 +20,11 @@ RUN set -x; \ python3-vobject \ python3-watchdog \ xz-utils \ - && curl -o wkhtmltox.tar.xz -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz \ - && echo '3f923f425d345940089e44c1466f6408b9619562 wkhtmltox.tar.xz' | sha1sum -c - \ - && tar xvf wkhtmltox.tar.xz \ - && cp wkhtmltox/lib/* /usr/local/lib/ \ - && cp wkhtmltox/bin/* /usr/local/bin/ \ - && cp -r wkhtmltox/share/man/man1 /usr/local/share/man/ + && curl -o wkhtmltox.deb -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ + && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ + && dpkg --force-depends -i wkhtmltox.deb\ + && apt-get -y install -f --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* wkhtmltox.deb # Install Odoo ENV ODOO_VERSION 11.0 diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 43903f4..8d48358 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -20,12 +20,11 @@ RUN set -x; \ python3-vobject \ python3-watchdog \ xz-utils \ - && curl -o wkhtmltox.tar.xz -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz \ - && echo '3f923f425d345940089e44c1466f6408b9619562 wkhtmltox.tar.xz' | sha1sum -c - \ - && tar xvf wkhtmltox.tar.xz \ - && cp wkhtmltox/lib/* /usr/local/lib/ \ - && cp wkhtmltox/bin/* /usr/local/bin/ \ - && cp -r wkhtmltox/share/man/man1 /usr/local/share/man/ + && curl -o wkhtmltox.deb -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \ + && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \ + && dpkg --force-depends -i wkhtmltox.deb\ + && apt-get -y install -f --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* wkhtmltox.deb # Install Odoo ENV ODOO_VERSION 12.0