Merge branch 'master' into develop

This commit is contained in:
chabad360 2018-10-05 12:35:49 -07:00 committed by GitHub
commit cde3a5ce0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -5,6 +5,7 @@ FROM ubuntu:16.04
LABEL MAINTAINER frappé
USER root
RUN useradd -ms /bin/bash frappe
RUN apt-get update
RUN apt-get install -y iputils-ping git build-essential python-setuptools python-dev libffi-dev libssl-dev libjpeg8-dev \
redis-tools redis-server software-properties-common libxrender1 libxext6 xfonts-75dpi xfonts-base zlib1g-dev libfreetype6-dev \
@ -13,6 +14,7 @@ RUN apt-get install -y iputils-ping git build-essential python-setuptools python
RUN pip install --upgrade setuptools pip
RUN useradd -ms /bin/bash -G sudo frappe && printf '# User rules for frappe\nfrappe ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/frappe
# Generate locale C.UTF-8 for mariadb and general locale data
ENV LANG C.UTF-8
@ -29,6 +31,6 @@ USER root
RUN pip install -e bench-repo \
&& npm install -g yarn \
&& chown -R frappe:frappe /home/frappe/*
USER frappe
WORKDIR /home/frappe/frappe-bench