From dd922b777577a112a86e8c84729c790ae215fc28 Mon Sep 17 00:00:00 2001 From: Disassembler Date: Sun, 21 Mar 2021 11:24:17 +0100 Subject: [PATCH] Inject qt-patched wkhtmltopdf to Odoo --- lxc-apps/odoo/app | 4 ++-- lxc-apps/odoo/image | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/lxc-apps/odoo/app b/lxc-apps/odoo/app index b607f22..318e894 100644 --- a/lxc-apps/odoo/app +++ b/lxc-apps/odoo/app @@ -1,5 +1,5 @@ { - "version": "14.0.0-210320", + "version": "14.0.0-210321", "meta": { "title": "Odoo", "desc-cs": "Sada aplikací pro správu organizace", @@ -8,7 +8,7 @@ }, "containers": { "odoo": { - "image": "odoo_14.0.0-210320", + "image": "odoo_14.0.0-210321", "depends": [ "odoo-postgres" ], diff --git a/lxc-apps/odoo/image b/lxc-apps/odoo/image index 1a6a7f3..344c560 100644 --- a/lxc-apps/odoo/image +++ b/lxc-apps/odoo/image @@ -1,12 +1,21 @@ -IMAGE odoo_14.0.0-210320 +IMAGE odoo_14.0.0-210321 FROM alpine3.12-python3.8_3.8.5-210106 RUN EOF # Install runtime dependencies - apk --no-cache add libffi libjpeg-turbo libpq nodejs wkhtmltopdf + apk --no-cache add libffi libjpeg-turbo libpq nodejs ttf-dejavu ttf-droid ttf-freefont ttf-liberation ttf-ubuntu-font-family wkhtmltopdf # Install build dependencies - apk --no-cache add --virtual .deps build-base git libffi-dev libjpeg-turbo-dev libxml2-dev libxslt-dev linux-headers openldap-dev postgresql-dev python3-dev + apk --no-cache add --virtual .deps build-base git libffi-dev libjpeg-turbo-dev libxml2-dev libxslt-dev linux-headers msttcorefonts-installer openldap-dev postgresql-dev python3-dev + + # Update fonts + update-ms-fonts + fc-cache -f + + # Replace wkhtmltopdf + # Extracted from https://github.com/Surnet/docker-wkhtmltopdf + # wkhtmltopdf 0.12.7 is expected to support Alpine linux out of the box + wget https://repo.spotter.cz/libwkhtmltox.tar.xz -O - | tar -xJf - -C / # Clone Odoo repository git clone -b 14.0 --depth 1 https://github.com/odoo/odoo.git /srv/odoo