From 581966352d47eb9e63a16a18cf12469a308f47c4 Mon Sep 17 00:00:00 2001
From: chabad360 <chabad360@gmail.com>
Date: Fri, 5 Oct 2018 19:57:59 +0000
Subject: [PATCH] fixed travis, and cleaned up dbench a little

---
 .travis.yml | 10 +++++-----
 Dockerfile  |  6 +++---
 dbench      |  9 ++++-----
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1623cef8..7997266a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,11 +8,11 @@ services:
   - docker
 
 install:
-  - chmod ugo+x ./bench
-  - ./bench setup docker
-  - ./bench init frappe-bench
-  - ./bench new-site site1.local
-  - ./bench setup hosts'
+  - chmod ugo+x ./dbench
+  - ./dbench setup docker
+  - ./dbench init frappe-bench
+  - ./dbench new-site site1.local
+  - ./dbench setup hosts'
   - pip install --upgrade virtualenv
   - virtualenv -p python3 testenv
   - source testenv/bin/activate
diff --git a/Dockerfile b/Dockerfile
index 03658b20..3dd9e562 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,6 @@ FROM ubuntu:16.04
 LABEL MAINTAINER frappé
 
 USER root
-RUN useradd -ms /bin/bash frappe
 RUN apt-get update
 RUN 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 \
@@ -30,7 +29,8 @@ RUN git clone -b master https://github.com/frappe/bench.git bench-repo
 USER root
 RUN pip install -e bench-repo \
   && npm install -g yarn \
-  && chown -R frappe:frappe /home/frappe/*
-  
+  && chown -R frappe:frappe /home/frappe/* \
+  && && rm -rf /var/lib/apt/lists/*
+
 USER frappe
 WORKDIR /home/frappe/frappe-bench
diff --git a/dbench b/dbench
index 2433cc73..7ed7e387 100755
--- a/dbench
+++ b/dbench
@@ -1,10 +1,9 @@
-
 #!/bin/bash
 
 if [[ $# -eq 0 ]]; then
     docker exec -it frappe bash
 elif [ "$1" == 'init' ]; then
-    docker exec -it -u root frappe bash -c "cd /home/frappe && chown -R frappe:frappe ./*"
+    docker exec -itu root frappe bash -c "cd /home/frappe && chown -R frappe:frappe ./*"
     docker exec -i frappe bash -c "cd .. && bench init frappe-bench --ignore-exist --skip-redis-config-generation"
     docker exec -i frappe bash -c "mv Procfile_docker Procfile && mv sites/common_site_config_docker.json sites/common_site_config.json && bench set-mariadb-host mariadb"
 elif [ "$1" == 'setup' ]; then
@@ -20,15 +19,15 @@ elif [ "$1" == 'setup' ]; then
         a=$(echo $a | tr -d / )
         result="127.0.0.1 ${a}"
         sudo echo $result >> /etc/hosts
-        docker exec -u root -i frappe bash -c "echo ${result} | tee --append /etc/hosts"
+        docker exec -iu root frappe bash -c "echo ${result} | tee --append /etc/hosts"
         docker exec -itu root frappe bash -c "printf '# User rules for frappe\nfrappe ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/frappe"
     fi
 elif [ "$1" == '-c' ]; then
     shift
     user=$1
     shift
-    docker exec -i -u "$user" frappe bash -c "$@"
+    docker exec -iu "$user" frappe bash -c "$@"
 else
     IFS=" "
-    docker exec -i frappe bash -c "bench $*"
+    docker exec -it frappe bash -c "bench $*"
 fi
\ No newline at end of file