From f777980c40add8d6b57c28c9f3e63e61cf79d534 Mon Sep 17 00:00:00 2001
From: 6cUbi57z <6cUbi57z@g-de.co.uk>
Date: Sun, 2 Jan 2022 17:28:18 +0000
Subject: [PATCH 1/2] Fix root access being requested when not required

---
 admin/lib/common.inc.bash | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/admin/lib/common.inc.bash b/admin/lib/common.inc.bash
index db7eb4ee..4c4e9fc6 100644
--- a/admin/lib/common.inc.bash
+++ b/admin/lib/common.inc.bash
@@ -21,12 +21,12 @@ then
       DOCKER_CMD='docker'
       ;;
     linux*)
-      if groups | grep -Eqw 'sudo|wheel'
-      then
-        DOCKER_CMD='sudo docker'
-      elif groups | grep -Eqw 'docker|root'
+      if groups | grep -Eqw 'docker|root'
       then
         DOCKER_CMD='docker'
+      elif groups | grep -Eqw 'sudo|wheel'
+      then
+        DOCKER_CMD='sudo docker'
       else
         echo >&2 "$SCRIPT_NAME: cannot set docker command: please either"
         echo >&2 "  * add the user '$USER' to the group 'sudo' or 'wheel'"
@@ -49,12 +49,12 @@ then
       DOCKER_COMPOSE_CMD='docker-compose'
       ;;
     linux*)
-      if groups | grep -Eqw 'sudo|wheel'
-      then
-        DOCKER_COMPOSE_CMD='sudo docker-compose'
-      elif groups | grep -Eqw 'docker-compose|root'
+      if groups | grep -Eqw 'docker|root'
       then
         DOCKER_COMPOSE_CMD='docker-compose'
+      elif groups | grep -Eqw 'sudo|wheel'
+      then
+        DOCKER_COMPOSE_CMD='sudo docker-compose'
       else
         echo >&2 "$SCRIPT_NAME: cannot set docker-compose command: please either"
         echo >&2 "  * add the user '$USER' to the group 'sudo' or 'wheel'"

From e8bfdedc839afd0bacd898f957023d7a6aab21a2 Mon Sep 17 00:00:00 2001
From: 6cUbi57z <6cUbi57z@g-de.co.uk>
Date: Sun, 2 Jan 2022 18:06:29 +0000
Subject: [PATCH 2/2] Fix docker compose service name

---
 docker-compose.dev.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 1635e277..f94cf9bc 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -5,7 +5,7 @@ services:
     ports:
       - "5432:5432"
 
-  solr:
+  search:
     ports:
       - "8983:8983"