Merge branch 'master' into master

This commit is contained in:
chabad360 2019-11-01 16:32:40 -04:00 committed by GitHub
commit 441f0916d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 3 deletions

View file

@ -25,7 +25,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
&& rm node.deb \ && rm node.deb \
&& npm install -g yarn && npm install -g yarn
# Add frappe user and setup sudo # Add frappe user and setup sudo
RUN groupadd -g 500 frappe \ RUN groupadd -g 500 frappe \
&& useradd -ms /bin/bash -u 500 -g 500 -G sudo frappe \ && useradd -ms /bin/bash -u 500 -g 500 -G sudo frappe \

View file

@ -8,7 +8,7 @@ This is a repo designed to aide setting up frappe/ERPNext on docker.
These instructions will get you a copy of the project up and running on your local machine for development and testing purposes. These instructions will get you a copy of the project up and running on your local machine for development and testing purposes.
Unfortunetly, this container is not curently suited for a production enviorment (but we're working towards that goal!). Unfortunately, this container is not curently suited for a production environment (but we're working towards that goal!).
### Build the container and initialize the bench ### Build the container and initialize the bench

View file

@ -18,4 +18,4 @@ do
echo "${output}" | grep '<title> Login </title>' && exit echo "${output}" | grep '<title> Login </title>' && exit
done done
if ! [[ "$?" == 0 ]]; then exit 1; fi if ! [[ "$?" == 0 ]]; then exit 1; fi