rccontrol: fixed cli commands

scripts/dev/dev.sh

@@ -2,15 +2,15 b''
 set -euo pipefail
 IFS=$'\n\t'
 
-#docker image tag 94977371485a rhodecode/app_source:4.27.0.DEV_BUILD
 #export RC_VERSION="4.28.0.REL20221120_SOURCE"
+#docker image tag 94977371485a rhodecode/rhodecode-ee:4.27.0.DEV_BUILD
 
 
 usage="$(basename "$0") ./dev.sh <COMMAND> -- run docker command
 where <COMMAND>:
-    [v]cs       -- run bash console for vcsserver
-    [r]c        -- run bash console for rhodecode-ee
-    ce          -- run bash console for rhodecode-ce
+    v|vcs       -- run bash console for vcsserver
+    e|ee        -- run bash console for rhodecode-ee
+    c|ce        -- run bash console for rhodecode-ce
     dev-env     -- create dev env required to run vcsserver and rhodecode
     "
 
@@ -20,11 +20,11 b' case ${1:-} in'
         eval "(docker stop dev-vcsserver || echo skip-stop ) && ./rccontrol stack rhodecode -f docker-compose-apps.dev.yaml run --service-ports --rm --use-aliases --workdir="/home/rhodecode/rhodecode-vcsserver" --name="dev-vcsserver" vcsserver bash"
         exit
         ;;
-    r|rc )
+    e|ee )
         eval "(docker stop dev-enterprise-ee || echo skip-stop ) && ./rccontrol stack rhodecode -f docker-compose-apps.dev.yaml run -e RC_APP_TYPE=rhodecode_bash --publish 10020:10020 --rm --use-aliases --workdir="/home/rhodecode/rhodecode-enterprise-ee" --name="dev-enterprise-ee" rhodecode bash"
         exit
         ;;
-    ce )
+    c|ce )
         eval "(docker stop dev-enterprise-ce || echo skip-stop ) && ./rccontrol stack rhodecode -f docker-compose-apps.dev.yaml run --publish 10022:10020 --rm --use-aliases --workdir="/home/rhodecode/rhodecode-enterprise-ce" --name="dev-enterprise-ce" rhodecode bash"
         exit
         ;;

scripts/rccontrol/rccontrol

@@ -731,7 +731,7 b' rccontrol_cli_usage() {'
   echo "  redis        CLI for Redis"
   echo "  db           CLI with Database connection"
   echo "  db-upgrade   CLI to run db upgrade"
-  echo "  storage      CLI for repository storage"
+  echo "  storage      CLI for repository storage. Exposes a basic image with mounted data and repositories volumes"
   echo
 
   # :command.long_usage
@@ -836,11 +836,11 b' rccontrol_cli_db_upgrade_usage() {'
 # :command.usage
 rccontrol_cli_storage_usage() {
   if [[ -n $long_usage ]]; then
-    printf "rccontrol cli storage - CLI for repository storage\n"
+    printf "rccontrol cli storage - CLI for repository storage. Exposes a basic image with mounted data and repositories volumes\n"
     echo
 
   else
-    printf "rccontrol cli storage - CLI for repository storage\n"
+    printf "rccontrol cli storage - CLI for repository storage. Exposes a basic image with mounted data and repositories volumes\n"
     echo
 
   fi
@@ -2071,12 +2071,24 b' rccontrol_cli_db_command() {'
     exit
   fi
 
+  .env --file $RUNTIME_ENV
+
+  .env get DB_PASSWORD
+  DB_PASSWORD=$REPLY
+
+  .env get DB_NAME
+  DB_NAME=$REPLY
+
+  .env get DB_USER
+  DB_USER=$REPLY
+
   if [[ $DEBUG ]]; then
-    echo "Running |docker exec --interactive --tty $docker_id $CMD|"
+    echo "Running |docker exec --env-file $RUNTIME_ENV --interactive --tty $docker_id $CMD|"
     echo "docker exec --interactive --tty $docker_id  /bin/bash -c 'PGPASSWORD=$DB_PASSWORD psql --username=$DB_USER --dbname=$DB_NAME'"
   fi
 
-  eval "docker exec --interactive --tty $docker_id  /bin/bash -c 'PGPASSWORD=$DB_PASSWORD psql --username=$DB_USER --dbname=$DB_NAME'"
+  echo
+  eval "docker exec --env-file $RUNTIME_ENV --interactive --tty $docker_id  /bin/bash -c 'PGPASSWORD=$DB_PASSWORD psql --username=$DB_USER --dbname=$DB_NAME'"
 
 }
 
@@ -2116,7 +2128,6 b' rccontrol_cli_storage_command() {'
   DEBUG=${args[--debug]}
   ENV_FILE=${args[--env-file-path]}
 
-  source $ENV_FILE
   target_container=$RC_IMAGE_EE
 
   image_id=$(docker image ls $RC_IMAGE_EE -q)
@@ -2133,8 +2144,8 b' rccontrol_cli_storage_command() {'
     echo "rc_datavolume inspection..."
     docker volume inspect rc_datavolume
 
-    echo "rhodecode_repos inspection..."
-    docker volume inspect rhodecode_repos
+    echo "rc_reposvolume inspection..."
+    docker volume inspect rc_reposvolume
   fi
 
   #
@@ -3799,6 +3810,9 b' initialize() {'
   # bootstrap file is a config file at the same time
   CONFIG_FILE=${RCC_CONFIG:=.rccontrol.ini}
 
+  # runtime env file
+  RUNTIME_ENV=$PWD/.custom/.runtime.env
+
   # STACK_LIST
   VALID_SERVICES="router metrics services rhodecode"
   DOCKER_DEFS_WORK_DIR="docker_defs"