Merge pull request #322 from hollaex/testnet

HollaEx CLI v3.0.1 Release

hollaex

@@ -102,6 +102,19 @@ if [[ ! "$HOLLAEX_NETWORK_OPERATION" ]]; then
 
 fi
 
+check_git_conflict() {
+    local file=$1
+
+    if grep -q '<< HEAD' "$file" && grep -q '==' "$file" && grep -q '>>' "$file"; then
+        echo -e "\nError: Git conflict detected in file: $file"
+        echo "Please check the file and fix the Git conflict to proceed."
+        exit 1;
+    fi
+}
+
+check_git_conflict settings/configmap;
+check_git_conflict settings/secret;
+
 err_msg() { echo "$@" ;} >&2
 err_msg_a() { err_msg "-a option argument required" ;}
 err_msg_l() { err_msg "--long option argument required" ;}
@@ -5197,7 +5210,7 @@ elif [[ "$1" == "web" ]]; then
 
             # apply_nginx_root_domain_to_web
 
-            if command docker compose -f $HOLLAEX_CLI_INIT_PATH/web/docker-compose.yaml -p client up -d; then
+            if command docker compose -f $HOLLAEX_CLI_INIT_PATH/web/docker-compose.yaml -p client up --build -d; then
 
                 echo "Starting the Nginx..."
                 if command docker compose -f ${HOLLAEX_CLI_INIT_PATH}/nginx/docker-compose.yaml up -d; then

version

@@ -1 +1 @@
-3.0.0
+3.0.1