mirror of
https://github.com/frappe/frappe_docker.git
synced 2026-06-25 16:55:08 +00:00
Install wkhtmltox correctly
This commit is contained in:
parent
4e7dd47d0e
commit
3328854825
2 changed files with 9 additions and 2 deletions
10
Dockerfile
10
Dockerfile
|
|
@ -10,7 +10,7 @@ ENV LANG C.UTF-8
|
||||||
RUN apt-get update && apt-get install -y --no-install-suggests --no-install-recommends build-essential cron curl git iputils-ping libffi-dev \
|
RUN apt-get update && apt-get install -y --no-install-suggests --no-install-recommends build-essential cron curl git iputils-ping libffi-dev \
|
||||||
liblcms2-dev libldap2-dev libmariadbclient-dev libsasl2-dev libssl-dev libtiff5-dev libwebp-dev mariadb-client \
|
liblcms2-dev libldap2-dev libmariadbclient-dev libsasl2-dev libssl-dev libtiff5-dev libwebp-dev mariadb-client \
|
||||||
python-dev python-pip python-setuptools python-tk redis-tools rlwrap software-properties-common sudo tk8.6-dev \
|
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 \
|
vim xfonts-75dpi xfonts-base wget \
|
||||||
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
|
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
|
||||||
&& pip install --upgrade setuptools pip --no-cache \
|
&& pip install --upgrade setuptools pip --no-cache \
|
||||||
&& curl https://deb.nodesource.com/node_10.x/pool/main/n/nodejs/nodejs_10.10.0-1nodesource1_amd64.deb > node.deb \
|
&& curl https://deb.nodesource.com/node_10.x/pool/main/n/nodejs/nodejs_10.10.0-1nodesource1_amd64.deb > node.deb \
|
||||||
|
|
@ -18,6 +18,12 @@ RUN apt-get update && apt-get install -y --no-install-suggests --no-install-reco
|
||||||
&& rm node.deb \
|
&& rm node.deb \
|
||||||
&& npm install -g yarn
|
&& npm install -g yarn
|
||||||
|
|
||||||
|
# Install wkhtmltox correctly
|
||||||
|
RUN wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz
|
||||||
|
RUN tar xvf wkhtmltox-0.12.4_linux-generic-amd64.tar.xz
|
||||||
|
RUN mv wkhtmltox/bin/wkhtmlto* /usr/bin/
|
||||||
|
RUN ln -nfs /usr/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf
|
||||||
|
|
||||||
# Add frappe user and setup sudo
|
# Add frappe user and setup sudo
|
||||||
RUN useradd -ms /bin/bash -G sudo frappe \
|
RUN useradd -ms /bin/bash -G sudo frappe \
|
||||||
&& printf '# Sudo rules for frappe\nfrappe ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/frappe
|
&& printf '# Sudo rules for frappe\nfrappe ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/frappe
|
||||||
|
|
@ -33,4 +39,4 @@ WORKDIR /home/frappe/frappe-bench
|
||||||
|
|
||||||
EXPOSE 8000 9000 6787
|
EXPOSE 8000 9000 6787
|
||||||
|
|
||||||
VOLUME [ "/home/frappe/frappe-bench" ]
|
VOLUME [ "/home/frappe/frappe-bench" ]
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- ./conf/mariadb-conf.d:/etc/mysql/conf.d
|
- ./conf/mariadb-conf.d:/etc/mysql/conf.d
|
||||||
- /var/lib/mysql
|
- /var/lib/mysql
|
||||||
|
# - ./db/var/lib/mysql for data persistence
|
||||||
|
|
||||||
ports:
|
ports:
|
||||||
- "3307:3306" # MariaDB Port
|
- "3307:3306" # MariaDB Port
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue