From e9080d3952b85bcf71851b8d90d4b90b3fa7bb1d Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Sun, 30 Aug 2020 00:06:56 +0530
Subject: [PATCH 1/2] fix: accept args for bench commands

---
 build/common/worker/bench                | 19 +++++++++++++++++++
 build/common/worker/docker-entrypoint.sh |  9 +--------
 build/frappe-worker/Dockerfile           |  1 +
 tests/docker-test.sh                     |  1 +
 tests/pwd.yml                            |  1 -
 5 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100755 build/common/worker/bench

diff --git a/build/common/worker/bench b/build/common/worker/bench
new file mode 100755
index 00000000..e9c931c2
--- /dev/null
+++ b/build/common/worker/bench
@@ -0,0 +1,19 @@
+#!/home/frappe/frappe-bench/env/bin/python
+
+import subprocess
+import sys
+import os
+
+
+if __name__ == "__main__":
+    bench_dir = os.path.join(os.sep, 'home', 'frappe', 'frappe-bench')
+    sites_dir = os.path.join(bench_dir, 'sites')
+    bench_helper = os.path.join(
+        bench_dir, 'apps', 'frappe',
+        'frappe', 'utils', 'bench_helper.py',
+    )
+    cwd = os.getcwd()
+    os.chdir(sites_dir)
+    subprocess.check_call(
+        [sys.executable, bench_helper, 'frappe'] + sys.argv[1:],
+    )
diff --git a/build/common/worker/docker-entrypoint.sh b/build/common/worker/docker-entrypoint.sh
index 171de971..9e9bd831 100755
--- a/build/common/worker/docker-entrypoint.sh
+++ b/build/common/worker/docker-entrypoint.sh
@@ -201,15 +201,8 @@ elif [ "$1" = 'restore-backup' ]; then
     && python /home/frappe/frappe-bench/commands/restore_backup.py"
   exit
 
-elif [ "$1" = 'bench' ]; then
-
-  exec su frappe -c '/home/frappe/frappe-bench/env/bin/python \
-    /home/frappe/frappe-bench/apps/frappe/frappe/utils/bench_helper.py \
-    frappe "$@"'
-  exit
-
 else
 
-  exec su frappe -c "$@"
+  exec $@
 
 fi
diff --git a/build/frappe-worker/Dockerfile b/build/frappe-worker/Dockerfile
index 68226660..27d77cfc 100644
--- a/build/frappe-worker/Dockerfile
+++ b/build/frappe-worker/Dockerfile
@@ -57,6 +57,7 @@ USER root
 COPY build/common/commands/* /home/frappe/frappe-bench/commands/
 COPY build/common/common_site_config.json.template /opt/frappe/common_site_config.json.template
 COPY build/common/worker/install_app.sh /usr/local/bin/install_app
+COPY build/common/worker/bench /usr/local/bin/bench
 
 # Setup docker-entrypoint
 COPY build/common/worker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
diff --git a/tests/docker-test.sh b/tests/docker-test.sh
index d81e2b0b..c09726bf 100755
--- a/tests/docker-test.sh
+++ b/tests/docker-test.sh
@@ -413,4 +413,5 @@ echo -e "\e[1m\e[4mCheck bench --help\e[0m"
 docker run \
     -v frappebench00_sites-vol:/home/frappe/frappe-bench/sites \
     --network frappebench00_default \
+    --user frappe \
     frappe/erpnext-worker:edge bench --help
diff --git a/tests/pwd.yml b/tests/pwd.yml
index 332e5b94..d4cb3550 100644
--- a/tests/pwd.yml
+++ b/tests/pwd.yml
@@ -23,7 +23,6 @@ services:
 
   erpnext-nginx:
     image: frappe/erpnext-nginx:edge
-    restart: on-failure
     environment:
       - FRAPPE_PY=erpnext-python
       - FRAPPE_PY_PORT=8000

From e4e702987bcdc845025d737fa07ad70bf1f8b946 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Sun, 30 Aug 2020 11:01:09 +0530
Subject: [PATCH 2/2] docs: update docs for bench helper

[skip travis]
---
 docs/site-operations.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/site-operations.md b/docs/site-operations.md
index 6807b2f4..46f51be9 100644
--- a/docs/site-operations.md
+++ b/docs/site-operations.md
@@ -212,6 +212,7 @@ To execute commands using bench helper.
  docker run \
     -v <project-name>_sites-vol:/home/frappe/frappe-bench/sites \
     --network <project-name>_default \
+    --user frappe \
     frappe/frappe-worker:$VERSION bench --help
 ```
 
@@ -221,7 +222,11 @@ Example command to clear cache
  docker run \
     -v <project-name>_sites-vol:/home/frappe/frappe-bench/sites \
     --network <project-name>_default \
+    --user frappe \
     frappe/frappe-worker:$VERSION bench --site erp.mysite.com clear-cache
 ```
 
-Use it to install/uninstall custom apps, add system manager user, etc.
+Notes:
+
+- Use it to install/uninstall custom apps, add system manager user, etc.
+- To run the command as non root user add the command option `--user frappe`.