From 98bdef566966ab722099c474deb8eca0187cd030 Mon Sep 17 00:00:00 2001
From: Mendel Greenberg <chabad360@gmail.com>
Date: Thu, 14 Feb 2019 22:55:29 -0500
Subject: [PATCH] moving some things around

---
 Dockerfile | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c3f179ed..761ca018 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,27 +10,35 @@ ENV LANG C.UTF-8
 RUN apt-get update && apt-get install -y --no-install-recommends 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 liblcms2-dev libwebp-dev python-tk apt-transport-https libsasl2-dev libldap2-dev libtiff5-dev tcl8.6-dev \
-  tk8.6-dev wget libmysqlclient-dev mariadb-client mariadb-common curl rlwrap redis-tools nano wkhtmltopdf python-pip vim sudo \
+  tk8.6-dev wget libmysqlclient-dev mariadb-client mariadb-common curl rlwrap redis-tools wkhtmltopdf python-pip sudo \
   && apt-get clean && rm -rf /var/lib/apt/lists/*
 RUN pip install --upgrade setuptools pip && rm -rf ~/.cache/pip
-RUN useradd -ms /bin/bash -G sudo frappe && printf '# User rules for frappe\nfrappe ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/frappe
 
-#nodejs
+# Install Node.js and yarn
 RUN curl https://deb.nodesource.com/node_10.x/pool/main/n/nodejs/nodejs_10.10.0-1nodesource1_amd64.deb > node.deb \
- && dpkg -i node.deb \
- && rm node.deb
+  && dpkg -i node.deb \
+  && rm node.deb \
+  && npm install -g yarn
+
+# Add frappe user and setup sudo
+RUN useradd -ms /bin/bash -G sudo frappe \
+  && printf '# Sudo rules for frappe\nfrappe ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/frappe
 
 USER frappe
 WORKDIR /home/frappe
-RUN chown -R frappe:frappe /home/frappe \
-  && git clone -b master https://github.com/frappe/bench.git bench-repo
+# Add some bench files
+COPY --chown=frappe:frappe ./frappe-bench /home/frappe/frappe-bench
 
 USER root
 # Install bench
-RUN pip install -e git+https://github.com/frappe/bench.git#egg=bench \
+RUN pip install -e git+https://github.com/frappe/bench.git \
   && rm -rf ~/.cache/pip
 
 USER frappe
-# Add some bench files
-COPY --chown=frappe:frappe ./frappe-bench /home/frappe/frappe-bench
 WORKDIR /home/frappe/frappe-bench
+
+EXPOSE 8000
+EXPOSE 9000
+EXPOSE 6787
+
+VOLUME [ "/home/frappe/frappe-bench" ]
\ No newline at end of file