From cf3c4dc1733ccee1276d1ce8536428346c593f55 Mon Sep 17 00:00:00 2001
From: Mendel Greenberg <chabad360@gmail.com>
Date: Thu, 24 Jan 2019 06:33:24 -0500
Subject: [PATCH] added a .dockerignore and fixed the dockerfile up a bit

---
 .dockerignore |  7 +++++++
 Dockerfile    | 18 ++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..37f67d5a
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,7 @@
+# frappe_docker .dockerignore file
+
+conf/*
+.travis.yml
+test.py
+dbench
+docker-*.yml
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index fcd268a9..32e044d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,16 @@
-
-#bench Dockerfile
+# Frappe Bench Dockerfile
 
 FROM ubuntu:16.04
-LABEL MAINTAINER frappé
+LABEL author=frappé
 
-USER root
 # Generate locale C.UTF-8 for mariadb and general locale data
 ENV LANG C.UTF-8
 
-RUN apt-get update && 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 \
-  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 && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && 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 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 \
+  && 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
 
@@ -31,5 +29,5 @@ RUN pip install -e bench-repo && rm -rf ~/.cache/pip \
   && npm install -g yarn
 
 USER frappe
-ADD ./frappe-bench /home/frappe/frappe-bench
+ADD --chown=frappe:frappe ./frappe-bench /home/frappe/frappe-bench
 WORKDIR /home/frappe/frappe-bench