diff --git a/docker/docker_start.sh b/docker/docker_start.sh index fb87c1eff..d10ddd76c 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 + CONSOLE_FLAGS="" + if [ "$ENABLE_CONSOLE_MANAGEMENT" != "" ]; then + CONSOLE_FLAGS="$CONSOLE_FLAGS console_management" + fi + if [ "$ENABLE_CONSOLE_CONTEXT" != "" ]; then + CONSOLE_FLAGS="$CONSOLE_FLAGS context" + fi + if [ "$ENABLE_CONSOLE_TAINTED" != "" ]; then + CONSOLE_FLAGS="$CONSOLE_FLAGS tainted" + fi + if [ "$ENABLE_CONSOLE_MANUAL" != "" ]; then + CONSOLE_FLAGS="$CONSOLE_FLAGS manual" + fi + if [ "$ENABLE_CONSOLE_CUSTOM" != "" ]; then + CONSOLE_FLAGS="$CONSOLE_FLAGS custom" + fi + if [ "$CONSOLE_FLAGS" != "" ]; then + # shellcheck disable=SC2086 + cscli console enable$CONSOLE_FLAGS + fi fi ## Register bouncers via secrets (Swarm only)