From ec4cd3e76209dc1047faf208bf07e7ea90bf37bc Mon Sep 17 00:00:00 2001
From: chabad360 <chabad360@gmail.com>
Date: Wed, 1 Aug 2018 13:05:45 -0700
Subject: [PATCH] better work

---
 Dockerfile | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a212e88e..a460a7d0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,6 @@ FROM ubuntu:16.04
 MAINTAINER frappé
 
 USER root
-RUN useradd -ms /bin/bash frappe
 RUN apt-get update
 RUN apt-get install -y iputils-ping
 RUN apt-get install -y git build-essential python-setuptools python-dev libffi-dev libssl-dev
@@ -14,6 +13,7 @@ RUN apt-get install -y libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev lib
 RUN apt-get install -y wget
 RUN wget https://bootstrap.pypa.io/get-pip.py && python get-pip.py
 RUN pip install --upgrade setuptools pip
+RUN useradd -ms /bin/bash frappe
 RUN apt-get install -y curl
 RUN apt-get install -y rlwrap
 RUN apt-get install redis-tools
@@ -28,15 +28,17 @@ RUN curl https://deb.nodesource.com/node_6.x/pool/main/n/nodejs/nodejs_6.7.0-1no
  && dpkg -i node.deb \
  && rm node.deb
 RUN apt-get install -y wkhtmltopdf
-RUN apt-get install -y libmysqlclient-dev mariadb-client mariadb-common
-RUN npm install -g yarn
-RUN chown -R frappe:frappe /home/frappe/*
-ENV PATH /home/frappe/.local/bin
-
 
 USER frappe
-WORKDIR /home/frappe/
-RUN git clone https://github.com/frappe/bench.git bench-repo
-RUN pip install --user -e bench-repo
-ENV PATH /home/frappe/.local/bin:$PATH
-WORKDIR /home/frappe/
+WORKDIR /home/frappe
+RUN git clone -b master https://github.com/frappe/bench.git bench-repo
+
+USER root
+RUN pip install -e bench-repo
+RUN apt-get install -y libmysqlclient-dev mariadb-client mariadb-common
+RUN npm install -g yarn
+RUN chown -R frappe:frappe /home/frappe
+ENV PATH /home/frappe/.local/bin
+
+USER frappe
+WORKDIR /home/frappe/frappe-bench