code cleaning

This commit is contained in:
marty 2019-08-13 17:59:44 +00:00
parent 3328854825
commit a4d981d431
2 changed files with 4 additions and 5 deletions

View file

@ -19,10 +19,10 @@ RUN apt-get update && apt-get install -y --no-install-suggests --no-install-reco
&& 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
RUN wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz \
&& tar xvf wkhtmltox-0.12.4_linux-generic-amd64.tar.xz \
&& mv wkhtmltox/bin/wkhtmlto* /usr/bin/ \
&& ln -nfs /usr/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf
# Add frappe user and setup sudo
RUN useradd -ms /bin/bash -G sudo frappe \

View file

@ -10,7 +10,6 @@ services:
volumes:
- ./conf/mariadb-conf.d:/etc/mysql/conf.d
- /var/lib/mysql
# - ./db/var/lib/mysql for data persistence
ports:
- "3307:3306" # MariaDB Port