Merge pull request #280 from hollaex/testnet

HollaEx CLI v2.6.4 Release

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 RUN apt-get update && apt-get install -y git curl sudo docker.io docker-compose
 

docker/Dockerfile.arm64v8

@@ -1,4 +1,4 @@
-FROM arm64v8/ubuntu:18.04 
+FROM arm64v8/ubuntu:22.04
 
 RUN apt-get update && apt-get install -y git curl sudo docker.io docker-compose
 

docker/Dockerfile.testnet

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 RUN apt-get update && apt-get install -y git curl sudo docker.io docker-compose
 

docker/nginx-certbot/Dockerfile

@@ -1,6 +1,6 @@
-FROM nginx:1.15.8-alpine
+FROM amd64/nginx:1.24.0-alpine
 RUN apk add --no-cache certbot py-pip && \
-    apk add --no-cache --virtual .build-deps build-base libffi-dev openssl-dev python-dev && \
+    apk add --no-cache --virtual .build-deps build-base libffi-dev openssl-dev python3-dev && \
     pip install certbot-nginx && \
     apk del .build-deps
 EXPOSE 80

docker/nginx-certbot/Dockerfile.arm64v8

@@ -0,0 +1,8 @@
+FROM arm64v8/nginx:1.24.0-alpine
+RUN apk add --no-cache certbot py-pip && \
+    apk add --no-cache --virtual .build-deps build-base libffi-dev openssl-dev python3-dev && \
+    pip install certbot-nginx && \
+    apk del .build-deps
+EXPOSE 80
+EXPOSE 443
+CMD ["nginx", "-g", "daemon off;"]

docker/nginx-certbot/build.sh

@@ -0,0 +1,4 @@
+docker manifest create bitholla/nginx-with-certbot:1.24.0 bitholla/nginx-with-certbot:1.24.0-amd64 bitholla/nginx-with-certbot:1.24.0-arm64v8 --amend
+docker manifest annotate bitholla/nginx-with-certbot:1.24.0 bitholla/nginx-with-certbot:1.24.0-amd64 --arch amd64
+docker manifest annotate bitholla/nginx-with-certbot:1.24.0 bitholla/nginx-with-certbot:1.24.0-arm64v8 --arch arm64
+docker manifest push bitholla/nginx-with-certbot:1.24.0

hollaex

@@ -2982,8 +2982,9 @@ elif [[ "$1" == "pull" ]]; then
             -d '{"activation_code": "'$HOLLAEX_SECRET_ACTIVATION_CODE'"}' \
             $hollaexAPIURL/v2/exchange/activate
 
-            printf "\n\033[91mError: Exchange owner is not verified yet!\033[39m\n"
-            printf "Please visit https://dash.hollaex.com/verifyAgree and verify your account first.\n\n"
+            printf "\n\033[91mAn error has been occurred.\033[39m\n"
+            printf "Please check the error message above and try again.\n\n"
+            printf "If you haven't verified yourself, please visit https://dash.hollaex.com/verifyAgree and verify your account first.\n\n"
 
             exit 1;
 
@@ -6240,7 +6241,7 @@ elif [[ "$1" == "web" ]]; then
             fi
 
             echo "Starting (Scaling up) the web server on Kubernetes..."
-            if command kubectl scale deployment/$ENVIRONMENT_EXCHANGE_NAME-web --replicas=1 --namespace $ENVIRONMENT_EXCHANGE_NAME > /dev/null 2>&1 ; then
+            if command kubectl scale deployment/$ENVIRONMENT_EXCHANGE_NAME-web --replicas=${ENVIRONMENT_WEB_SERVER_REPLICAS:-1} --namespace $ENVIRONMENT_EXCHANGE_NAME > /dev/null 2>&1 ; then
 
                 hollaex_ascii_web_server_is_up;
 
@@ -6888,7 +6889,7 @@ elif [[ "$1" == "web" ]]; then
                     # Update exchange name
                     if command grep -q "ENVIRONMENT_EXCHANGE_NAME" $i > /dev/null ; then
                         CONFIGMAP_FILE_PATH=$i
-                        sed -i.bak "s/$ENVIRONMENT_WEB_SERVER_REPLICAS=.*/$ENVIRONMENT_WEB_SERVER_REPLICAS=$HOLLAEX_WEB_SCALE_TARGET_REPLICAS/" $CONFIGMAP_FILE_PATH
+                        sed -i.bak "s/ENVIRONMENT_WEB_SERVER_REPLICAS=.*/ENVIRONMENT_WEB_SERVER_REPLICAS=$HOLLAEX_WEB_SCALE_TARGET_REPLICAS/" $CONFIGMAP_FILE_PATH
                         rm $CONFIGMAP_FILE_PATH.bak
                     fi
 

kubernetes/helm-chart/bitholla-hollaex-server/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 description: A Helm chart for HollaEx Kit
 name: hollaex-kit
-version: 2.6.1
+version: 2.6.2

kubernetes/helm-chart/bitholla-hollaex-web/templates/deployment.yaml

@@ -65,8 +65,8 @@ spec:
             command:
             - curl
             - http://localhost
-          initialDelaySeconds: 1
-          periodSeconds: 5
+          initialDelaySeconds: 15
+          periodSeconds: 15
 
 {{- if .Values.imagePullSecrets }}
       imagePullSecrets:

version

@@ -1 +1 @@
-2.6.3
+2.6.4