From da76847b939a7e7ab60e06f5fe67a9cbcecff12e Mon Sep 17 00:00:00 2001
From: Mendel Greenberg <chabad360@gmail.com>
Date: Fri, 18 Jan 2019 16:07:18 -0500
Subject: [PATCH] added a docker down feature to dbench and changed some of the
 docs

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

diff --git a/.travis.yml b/.travis.yml
index cda2ba5d..9bbe3de6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ install:
   - ./dbench setup docker
   - ./dbench init frappe-bench
   - ./dbench new-site site1.local
-  - sudo ./dbench setup hosts
+  - ./dbench setup hosts
   - pip install --upgrade virtualenv
   - virtualenv -p python3 testenv
   - source testenv/bin/activate
diff --git a/Dockerfile b/Dockerfile
index 3eca918a..f37a1eb0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,7 +29,6 @@ USER root
 RUN pip install -e bench-repo && rm -rf ~/.cache/pip \
   && npm install -g yarn \
   && chown -R frappe:frappe /home/frappe/*
-RUN printf '# User rules for frappe\nfrappe ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/frappe
 
 USER frappe
 WORKDIR /home/frappe/frappe-bench
diff --git a/dbench b/dbench
index aaaae858..bb283dca 100755
--- a/dbench
+++ b/dbench
@@ -9,6 +9,10 @@ elif [ "$1" == 'init' ]; then
 elif [ "$1" == 'setup' ] && [ "$2" == 'docker' ]; then
         if [ "$3" == '--swarm-mode' ]; then
             echo "Docker swarm mode is not currently supported"
+        elif [ "$3" == 'down' ]; then
+            docker-compose down
+        elif [ "$3" == 'stop' ]; then
+            docker-compose stop
         else
             docker-compose up -d
         fi
@@ -22,7 +26,7 @@ elif [ "$1" == '-c' ]; then
     shift
     user=$1
     shift
-    docker exec -iu "$user" frappe bash -c "$@"
+    docker exec -iu $user frappe bash -c "$@"
 elif [ "$1" == '-h' ]; then
     echo "$0 [-h] | [ -c frappe | root <command to run> ] [ <command to send to bench> ]"
     echo ""
@@ -30,12 +34,12 @@ elif [ "$1" == '-h' ]; then
     echo "Usage:"
     echo "    $0"
     echo "                Launches you into an interactive shell in the container as user frappe"
-    echo "    $0 init bench-folder-name"
+    echo "    $0 init [ bench-folder-name ]"
     echo "                Runs \"bench init\" along with some other commands"
-    echo "    $0 setup docker"
+    echo "    $0 setup docker [ stop | down ]"
     echo "                Starts and builds the docker containers using \"docker-compose up -d\""
     echo "    $0 setup hosts"
-    echo "                Adds all sites to the hosts file, run with sudo"
+    echo "                Adds all sites to the containers hosts file"
     echo "    $0 -c frappe | root <command to run>"
     echo "                Runs a command in the container, as the selected user"
     echo "    $0 -h"