Merge pull request #326 from hollaex/develop

HollaEx CLI v3.0.4 Release
hollaex · Nov 1, 2024 · ab66282 · ab66282
2 parents d0f4187 + e5a77cb
commit ab66282
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 20 deletions.
diff --git a/hollaex b/hollaex
@@ -700,19 +700,6 @@ elif [[ "$1" == "init" ]]; then
     }
     done
 
-    if [[ "$hollaexAPIURL" == *"localhost"* ]]; then 
-
-        export HOLLAEX_INIT_LOCALHOST_MODE_INTERNAL_URL="http://hollaex-network-nginx"
-        export hollaexAPIURLEscaped=${HOLLAEX_INIT_LOCALHOST_MODE_INTERNAL_URL//\//\\/}
-
-        export HOLLAEX_NETWORK_LOCALHOST_MODE=true
-
-    else
-
-        export hollaexAPIURLEscaped=${hollaexAPIURL//\//\\/}
-
-    fi
-
     # Network URL health check
     while true;
         do if command curl $hollaexAPIURL/v2/health; then
@@ -728,6 +715,25 @@ elif [[ "$1" == "init" ]]; then
     printf "\n"
     echo "${hollaexAPIURL} ✔"
     printf "\n"
+
+    if [[ "$hollaexAPIURL" == *"http://localhost"* ]]; then 
+
+
+        export HOLLAEX_INIT_LOCALHOST_MODE_INTERNAL_DOMAIN="http://host.docker.internal"
+        HOLLAEX_INIT_LOCALHOST_MODE_INTERNAL_PORT=$(echo $hollaexAPIURL | cut -f3 -d ":")
+        export HOLLAEX_INIT_LOCALHOST_MODE_INTERNAL_PORT=${HOLLAEX_INIT_LOCALHOST_MODE_INTERNAL_PORT:-80}
+
+        export HOLLAEX_INIT_LOCALHOST_MODE_INTERNAL_URL="$HOLLAEX_INIT_LOCALHOST_MODE_INTERNAL_DOMAIN:$HOLLAEX_INIT_LOCALHOST_MODE_INTERNAL_PORT"
+
+        export hollaexAPIURLEscaped=${HOLLAEX_INIT_LOCALHOST_MODE_INTERNAL_URL//\//\\/}
+
+        export HOLLAEX_NETWORK_LOCALHOST_MODE=true
+
+    else
+
+        export hollaexAPIURLEscaped=${hollaexAPIURL//\//\\/}
+
+    fi
 
 
     if [[ "$RESTORE_FROM_BACKUP" ]]; then
@@ -845,8 +851,6 @@ elif [[ "$1" == "init" ]]; then
             echo -e "Please type your email address and password that you are going to use for your admin account.\n"
             echo "Email: "
             read hollaexAdminEmail
-            echo "Password: "
-            read -s hollaexAdminPassword
 
             while true;
                 do if [[ ! "$hollaexAdminEmail" == *"@"* ]]; then 
@@ -858,6 +862,21 @@ elif [[ "$1" == "init" ]]; then
                 fi
             done
 
+            echo -e "\nPassword: "
+            printf "\033[2m-Password must contain at least 8 characters and one digit.\033[22m\n\n"
+            read -s hollaexAdminPassword
+
+            while true;
+                do if [[ ${#hollaexAdminPassword} -lt 8 || ! "$hollaexAdminPassword" =~ [0-9] ]]; then
+                    printf "\nInvalid password. Please type it again.\n"
+                    printf "\033[2m-Password must contain at least 8 characters and one digit.\033[22m\n\n"
+                    echo "Password: "
+                    read -s hollaexAdminPassword
+                else
+                    break;
+                fi
+            done
+
             printf "\n\033[1mCreate Exchange\033[0m\n\n"
 
             echo -e "Please type in the name of your new exchange."
@@ -1339,7 +1358,7 @@ elif [[ "$1" == "setup" ]]; then
 
         check_docker_compose_is_installed;
 
-        if [[ "$HOLLAEX_CONFIGMAP_NETWORK_URL" == *"hollaex-network-nginx"* ]]; then 
+        if [[ "$HOLLAEX_CONFIGMAP_NETWORK_URL" == *"host.docker.internal"* ]]; then 
 
             echo "Hollaex Network URL: $HOLLAEX_CONFIGMAP_NETWORK_URL"
             export HOLLAEX_NETWORK_LOCALHOST_MODE=true
@@ -2740,7 +2759,7 @@ elif [[ "$1" == "start" ]]; then
 
         fi 
 
-        if [[ "$HOLLAEX_CONFIGMAP_NETWORK_URL" == *"hollaex-network-nginx"* ]]; then 
+        if [[ "$HOLLAEX_CONFIGMAP_NETWORK_URL" == *"host.docker.internal"* ]]; then 
 
             echo "Hollaex Network URL: $HOLLAEX_CONFIGMAP_NETWORK_URL"
             export HOLLAEX_NETWORK_LOCALHOST_MODE=true
@@ -5022,7 +5041,7 @@ elif [[ "$1" == "web" ]]; then
         source $i
     done;
 
-    if [[ "$HOLLAEX_CONFIGMAP_NETWORK_URL" == *"hollaex-network-nginx"* ]]; then 
+    if [[ "$HOLLAEX_CONFIGMAP_NETWORK_URL" == *"host.docker.internal"* ]]; then 
 
         echo "Hollaex Network URL: $HOLLAEX_CONFIGMAP_NETWORK_URL"
         export HOLLAEX_NETWORK_LOCALHOST_MODE=true

diff --git a/version b/version
@@ -1 +1 @@
-3.0.3
+3.0.4
diff --git a/version_range b/version_range
@@ -1,2 +1,2 @@
 HOLLAEX_KIT_MINIMUM_COMPATIBLE=2.11
-HOLLAEX_KIT_MAXIMUM_COMPATIBLE=2.12
+HOLLAEX_KIT_MAXIMUM_COMPATIBLE=2.13