From 8e0e92ad6c6a64ef98bbfba29ab39bd498ccb5c6 Mon Sep 17 00:00:00 2001 From: Sun Howwrongbum Date: Sun, 2 Sep 2018 14:27:49 +0530 Subject: [PATCH] Update to install patched wkhtmltopdf - docker ignore data dir --- .dockerignore | 2 ++ Dockerfile | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..9c84c363 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +/data_dir +/frappe-bench diff --git a/Dockerfile b/Dockerfile index 7f5b9a14..00d20c1f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,14 @@ RUN apt-get install curl RUN curl https://deb.nodesource.com/node_6.x/pool/main/n/nodejs/nodejs_6.7.0-1nodesource1~xenial1_amd64.deb > node.deb \ && dpkg -i node.deb \ && rm node.deb -RUN apt-get install -y wkhtmltopdf + +# Install patched wkhtmltopdf +RUN apt-get install -y libxrender1 libxext6 xfonts-75dpi xfonts-base +RUN wget https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz -O /tmp/wkhtmltox.tar.xz +RUN mkdir /tmp/wkhtmltox; \ + tar xvf /tmp/wkhtmltox.tar.xz -C /tmp; \ + cp /tmp/wkhtmltox/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf; \ + chmod o+x /usr/local/bin/wkhtmltopdf USER frappe WORKDIR /home/frappe