From 91b185133edc3a199dc5b8d7e46b8b3fcf7f8a42 Mon Sep 17 00:00:00 2001
From: Dmitrii Kustov <simbiat@outlook.com>
Date: Sun, 9 Feb 2025 09:18:15 +0200
Subject: [PATCH 1/2] Flags for console features

Add support for console features' flags besides managements
---
 docker/docker_start.sh | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/docker/docker_start.sh b/docker/docker_start.sh
index fb87c1eff..2b45998e2 100755
--- a/docker/docker_start.sh
+++ b/docker/docker_start.sh
@@ -447,9 +447,31 @@ for BOUNCER in $(compgen -A variable | grep -i BOUNCER_KEY); do
     fi
 done
 
-if [ "$ENABLE_CONSOLE_MANAGEMENT" != "" ]; then
+## Enable console features
+if [ "$ENABLE_CONSOLE_ALL" != "" ]; then
     # shellcheck disable=SC2086
-    cscli console enable console_management
+    cscli console enable -a
+else
+    if [ "$ENABLE_CONSOLE_MANAGEMENT" != "" ]; then
+        # shellcheck disable=SC2086
+        cscli console enable console_management
+    fi
+    if [ "$ENABLE_CONSOLE_CONTEXT" != "" ]; then
+        # shellcheck disable=SC2086
+        cscli console enable context
+    fi
+    if [ "$ENABLE_CONSOLE_TAINTED" != "" ]; then
+        # shellcheck disable=SC2086
+        cscli console enable tainted
+    fi
+    if [ "$ENABLE_CONSOLE_MANUAL" != "" ]; then
+        # shellcheck disable=SC2086
+        cscli console enable manual
+    fi
+    if [ "$ENABLE_CONSOLE_CUSTOM" != "" ]; then
+        # shellcheck disable=SC2086
+        cscli console enable custom
+    fi
 fi
 
 ## Register bouncers via secrets (Swarm only)

From f5064bface1ac8d7306c6a7ddc74d0512a582c5a Mon Sep 17 00:00:00 2001
From: Dmitrii Kustov <simbiat@outlook.com>
Date: Mon, 10 Feb 2025 12:48:35 +0200
Subject: [PATCH 2/2] Optimize cscli calls

---
 docker/docker_start.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docker/docker_start.sh b/docker/docker_start.sh
index 2b45998e2..d10ddd76c 100755
--- a/docker/docker_start.sh
+++ b/docker/docker_start.sh
@@ -452,25 +452,25 @@ if [ "$ENABLE_CONSOLE_ALL" != "" ]; then
     # shellcheck disable=SC2086
     cscli console enable -a
 else
+    CONSOLE_FLAGS=""
     if [ "$ENABLE_CONSOLE_MANAGEMENT" != "" ]; then
-        # shellcheck disable=SC2086
-        cscli console enable console_management
+        CONSOLE_FLAGS="$CONSOLE_FLAGS console_management"
     fi
     if [ "$ENABLE_CONSOLE_CONTEXT" != "" ]; then
-        # shellcheck disable=SC2086
-        cscli console enable context
+        CONSOLE_FLAGS="$CONSOLE_FLAGS context"
     fi
     if [ "$ENABLE_CONSOLE_TAINTED" != "" ]; then
-        # shellcheck disable=SC2086
-        cscli console enable tainted
+        CONSOLE_FLAGS="$CONSOLE_FLAGS tainted"
     fi
     if [ "$ENABLE_CONSOLE_MANUAL" != "" ]; then
-        # shellcheck disable=SC2086
-        cscli console enable manual
+        CONSOLE_FLAGS="$CONSOLE_FLAGS manual"
     fi
     if [ "$ENABLE_CONSOLE_CUSTOM" != "" ]; then
-        # shellcheck disable=SC2086
-        cscli console enable custom
+        CONSOLE_FLAGS="$CONSOLE_FLAGS custom"
+    fi
+    if [ "$CONSOLE_FLAGS" != "" ]; then
+       # shellcheck disable=SC2086
+       cscli console enable$CONSOLE_FLAGS
     fi
 fi