From 18b46e8a014dbbc1667be3e5cf0c76f7e6fb8bee Mon Sep 17 00:00:00 2001 From: MorezMartin Date: Sun, 3 Nov 2019 07:12:36 +0100 Subject: [PATCH] chore: install wkhtmltox correctly (#72) * Install wkhtmltox correctly * code cleaning * wkhtmltox working with 0.12.5 --- Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1bf30b73..20d55871 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,15 +16,19 @@ ENV LC_ALL=en_US.UTF-8 # Install all neccesary packages RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-suggests --no-install-recommends \ - build-essential cron curl git libffi-dev liblcms2-dev libldap2-dev libmariadbclient-dev libsasl2-dev libssl-dev libtiff5-dev \ + build-essential cron curl git libffi-dev liblcms2-dev libldap2-dev libmariadbclient-dev libsasl2-dev libssl1.0-dev libtiff5-dev \ libwebp-dev mariadb-client iputils-ping python-dev python-pip python-setuptools python-tk redis-tools rlwrap \ - software-properties-common sudo tk8.6-dev vim xfonts-75dpi xfonts-base wget wkhtmltopdf \ + software-properties-common sudo tk8.6-dev vim xfonts-75dpi xfonts-base wget wkhtmltopdf fonts-cantarell \ && apt-get clean && rm -rf /var/lib/apt/lists/* \ && curl https://deb.nodesource.com/node_10.x/pool/main/n/nodejs/nodejs_10.10.0-1nodesource1_amd64.deb > node.deb \ && dpkg -i node.deb \ && rm node.deb \ && npm install -g yarn +# Install wkhtmltox correctly +RUN wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb +RUN dpkg -i wkhtmltox_0.12.5-1.stretch_amd64.deb && rm wkhtmltox_0.12.5-1.stretch_amd64.deb + # Add frappe user and setup sudo RUN groupadd -g 500 frappe \ && useradd -ms /bin/bash -u 500 -g 500 -G sudo frappe \ @@ -43,4 +47,4 @@ WORKDIR /home/frappe/frappe-bench EXPOSE 8000 9000 6787 -VOLUME [ "/home/frappe/frappe-bench" ] \ No newline at end of file +VOLUME [ "/home/frappe/frappe-bench" ]