merge main to develop (#68)

Author: FriendlyCM

README.md

@@ -127,7 +127,7 @@ cd tron-docker
 ```
 
 ### Start feature by trond tool
-We offer a `trond` script that allows developers to easily initiate features with a single command, enabling the community to quickly engage in TRON network development and interaction.
+We offer a `trond` command-line tool that allows developers to easily initiate features with a single command, enabling the community to quickly engage in TRON network development and interaction.
 
 To build the `trond` command-line tool, simply run `build_trond.sh`.
 ```sh

metric_monitor/docker-compose.yml

@@ -0,0 +1,47 @@
+version: '3.8'
+services:
+  tron-node1:
+    image: tronprotocol/java-tron:latest
+    container_name: tron-node1
+    networks:
+      - tron_network
+    deploy:
+      resources:
+        limits:
+          memory: 16g
+    ports:
+      - "8090:8090" # for external http API request
+      - "9527:9527" # used for metric API
+    volumes:
+      - ../conf:/java-tron/conf
+      - ./datadir:/java-tron/data # mount a local directory to make the blocks data persistent.
+    command: >
+      -jvm "{-Xmx16g -Xms12g -XX:+UseConcMarkSweepGC -XX:+PrintGC}" -c ./conf/main_net_config.conf -d /java-tron/data
+
+  prometheus:
+    image: prom/prometheus:latest
+    container_name: prometheus
+    networks:
+      - tron_network
+    deploy:
+      resources:
+        limits:
+          memory: 1g
+    ports:
+      - "9090:9090" # used for external collect metrics
+    volumes:
+      - ./metric_conf/prometheus.yml:/etc/prometheus/prometheus.yml
+  grafana:
+    image: grafana/grafana-oss
+    container_name: grafana
+    networks:
+      - tron_network
+    deploy:
+      resources:
+        limits:
+          memory: 1g
+    ports:
+      - "3000:3000"
+networks:
+  tron_network:
+    driver: bridge

private_net/docker-compose.yml

@@ -8,7 +8,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 16g
+          memory: 12g
     ports:
       - "8090:8090" # for external http API request
       - "50051:50051" # for external rpc API request
@@ -27,7 +27,7 @@ services:
     #    deploy:
     #      resources:
     #        limits:
-    #          memory: 16g
+    #          memory: 12g
     #    volumes:
     #      - ../conf:/java-tron/conf
     #      - ./logs/tron-witness2:/java-tron/logs
@@ -43,7 +43,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 16g
+          memory: 12g
     volumes:
       - ../conf:/java-tron/conf
       - ./logs/tron-node1:/java-tron/logs
@@ -58,7 +58,7 @@ services:
 #    deploy:
 #      resources:
 #        limits:
-#          memory: 16g
+#          memory: 12g
 #    volumes:
 #      - ../conf:/java-tron/conf
 #      - ./logs/tron-node2:/java-tron/logs

tools/docker/docker_env/check-install-docker.sh

@@ -50,11 +50,11 @@ check_docker_running() {
             sudo systemctl start docker
             sleep 5
             sudo usermod -aG docker "$USER"
-            newgrp docker
-            if ! docker info &> /dev/null; then
+            if ! sudo docker info &> /dev/null; then
                 echo "Failed to start Docker daemon"
                 exit 1
             fi
+            echo "Logout and log back in for the docker group change to take effect"
         fi
     fi
     echo "Docker daemon is running"