From 61d2ae1e9b981c9492c081e5d4aebabbcff1b887 Mon Sep 17 00:00:00 2001
From: joezsweet <joezsweet@tiscali.it>
Date: Tue, 27 Feb 2018 10:44:14 +0100
Subject: [PATCH 1/2] Make work on latest

- clone bench master
- install yarn globally
- set lang as C.UTF-8
---
 Dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 2b0507b2..7f5b9a14 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,6 +19,8 @@ RUN apt-get install -y rlwrap
 RUN apt-get install redis-tools
 RUN apt-get install -y nano
 
+# Generate locale C.UTF-8 for mariadb and general locale data
+ENV LANG C.UTF-8
 
 #nodejs
 RUN apt-get install curl
@@ -29,11 +31,12 @@ RUN apt-get install -y wkhtmltopdf
 
 USER frappe
 WORKDIR /home/frappe
-RUN git clone -b develop https://github.com/frappe/bench.git bench-repo
+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/*
 
 USER frappe

From 3f7314d5aa2a94c2848e626dfe28b4fbfc537c8e Mon Sep 17 00:00:00 2001
From: joezsweet <joezsweet@tiscali.it>
Date: Tue, 27 Feb 2018 10:47:40 +0100
Subject: [PATCH 2/2] change to --ignore-exist

---
 dbench | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dbench b/dbench
index 9fd54a74..8731cf97 100755
--- a/dbench
+++ b/dbench
@@ -17,7 +17,7 @@ if [[ $# -eq 0 ]]; then
 elif [ $1 == 'init' ]
 then
   docker exec -i -u root frappe bash -c "cd /home/frappe && chown -R frappe:frappe ./*" 
-  docker exec -it frappe bash -c "cd .. && bench init frappe-bench --skip-bench-mkdir --skip-redis-config-generation && cd frappe-bench"
+  docker exec -it frappe bash -c "cd .. && bench init frappe-bench --ignore-exist --skip-redis-config-generation && cd frappe-bench"
   docker exec -it frappe bash -c "mv Procfile_docker Procfile && mv sites/common_site_config_docker.json sites/common_site_config.json"
   docker exec -it -u root frappe bash -c "apt-get install vim && apt-get install sudo && usermod -aG sudo frappe && printf '# User rules for frappe\nfrappe ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/frappe"
   docker exec -it frappe bash -c "bench set-mariadb-host mariadb"