udpate docker image

docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.9"
 
 services:
   net:
-    image: net
+    image: 192.168.1.220:5000/metanet:0.1
     container_name: net
     volumes:
       - ./net/net1/:/root/net/
@@ -24,6 +24,14 @@ services:
     entrypoint: /bin/sh /root/net/start.sh
     ports:
       - "38011:38010"
+  net2:
+    image: 192.168.1.220:5000/metanet:latest
+    container_name: net2
+    volumes:
+      - ./net/net2/:/root/net/
+    entrypoint: /bin/sh /root/net/start.sh
+    ports:
+      - "38011:38010"
     deploy:
       restart_policy:
         condition: on-failure
@@ -31,31 +39,9 @@ services:
         max_attempts: 100
         window: 120s
 
-  txchecker:
-    image: txchecker
-    container_name: txchecker
-    deploy:
-      restart_policy:
-        condition: on-failure
-        delay: 15s
-        max_attempts: 100
-        window: 120s
-
-  sentry:
-    image: sentry
-    container_name: sentry
-    deploy:
-      restart_policy:
-        condition: on-failure
-        delay: 15s
-        max_attempts: 100
-        window: 120s
-    volumes:
-      - ./sentry/app.json:/root/app.json
-
-  nebula:
+  nebula2:
     image: nebula
-    container_name: nebula
+    container_name: nebula2
     depends_on:
       - net
       - net2
@@ -67,12 +53,12 @@ services:
         max_attempts: 100
         window: 120s
     volumes:
-      - ./nebula/nebula1/config.toml:/root/config.toml
-      - ./nebula/nebula1/genesis.json:/root/genesis.json
-      - ./nebula/nebula1/data:/root/data
+      - ./nebula/nebula2/config.toml:/root/config.toml
+      - ./nebula/nebula2/genesis.json:/root/genesis.json
+      - ./nebula/nebula2/data:/root/data
 
   nebula2:
-    image: nebula
+    image: 192.168.1.220:5000/nebula:v0.0.1  
     container_name: nebula2
     depends_on:
       - net
@@ -89,9 +75,9 @@ services:
       - ./nebula/nebula2/genesis.json:/root/genesis.json
       - ./nebula/nebula2/data:/root/data
 
-  cryptor:
-    image: cryptor
-    container_name: cryptor
+  cryptor1:
+    image: 192.168.1.220:5000/cryptor:v0.0.1 
+    container_name: cryptor1
     deploy:
       restart_policy:
         condition: on-failure
@@ -100,33 +86,81 @@ services:
         window: 120s
     volumes:
       - ./cryptor/config.toml:/root/config.toml
-  ring:
-    image: ring
-    container_name: ring
-    entrypoint: MetaRing start  --ethconfig.httphost  0.0.0.0 --mempool.sentryurl  sentry:38003   --mempool.nebulaurl nebula:38004  --mempool.p2purl  net:38010  --mempool.cryptourl  cryptor:38001  --mempool.checkerurl txchecker:38002
+
+  cryptor2:
+    image: 192.168.1.220:5000/cryptor:v0.0.1 
+    container_name: cryptor2
+    deploy:
+      restart_policy:
+        condition: on-failure
+        delay: 15s
+        max_attempts: 100
+        window: 120s
+    volumes:
+      - ./cryptor/config.toml:/root/config.toml
+
+  ring1:
+    image: 192.168.1.220:5000/ring:v0.0.1
+    container_name: ring1
+    entrypoint: sh -c 'echo "ring" && sleep 10 && ringd start  --ethconfig.httphost  0.0.0.0 --mempool.sentryurl  sentry:38003   --mempool.nebulaurl nebula:38004  --mempool.p2purl  net:38010  --mempool.cryptourl  cryptor1:38001  --mempool.checkerurl txchecker:38002   --mempool.writeunreadytxs=false   --mempool.writerepeatedmsg=false     --mempool.batchconfirminittimeout=60   --mempool.batchconfirmtimeouti=1.5 --mempool.batchrepeatedqueuesize=0 >> /data/log' #>> /data/log
+    volumes:
+      - ./data/metaring1:/data
+
     depends_on:
+      - cryptor1
       - net
       - net2
       - sentry
-      - nebula
-      - nebula2
-      - cryptor
     deploy:
-      # resources:
-      #   limits:
-      #     cpus: "20.00"
-      #     memory: 20G
-      #   reservations:
-      #     cpus: "16.00"
-      #     memory: 16G
+      resources:
+        limits:
+          cpus: "36.00"
+          memory: 50G
+        reservations:
+          cpus: "30.00"
+          memory: 50G
       restart_policy:
         condition: on-failure
         delay: 15s
         max_attempts: 100
         window: 120s
     ports:
-      - "8545:8545"
-      - "5001:5001"
+<<<<<<< HEAD
+      - 8545:8545
+      - 5001:5001
+      - 38020:38020
+      - 6060:6060
+  ring2:
+    image: 192.168.1.220:5000/ring:v0.0.1
+    container_name: ring2
+    entrypoint: sh -c 'echo "ring" && sleep 1 && ringd start  --ethconfig.httphost  0.0.0.0 --mempool.sentryurl  sentry:38003   --mempool.nebulaurl nebula2:38004  --mempool.p2purl  net2:38010  --mempool.cryptourl  cryptor2:38001  --mempool.checkerurl txchecker:38002   --mempool.writeunreadytxs=false   --mempool.writerepeatedmsg=false     --mempool.batchconfirminittimeout=60   --mempool.batchconfirmtimeouti=1.5 --mempool.batchrepeatedqueuesize=0 >> /data/log' #>> /data/log
+
+    volumes:
+      - ./data/metaring2:/data
+
+    depends_on:
+      - cryptor2
+      - net
+      - sentry
+    deploy:
+      resources:
+        limits:
+          cpus: "36.00"
+          memory: 50G
+        reservations:
+          cpus: "30.00"
+          memory: 50G
+      restart_policy:
+        condition: on-failure
+        delay: 15s
+        max_attempts: 100
+        window: 120s
+    ports:
+      - 8546:8545
+      - 5002:5001
+      - 38021:38020
+      - 6061:6060
+
 
   prometheus:
     image: prom/prometheus:latest
@@ -152,11 +186,11 @@ services:
       - /sys:/sys:ro
       - /var/lib/docker/:/var/lib/docker:ro
     depends_on:
-      - ring
+      - ring1
+      - ring2
       - net
       - net2
       - sentry
       - txchecker
-      - cryptor
       - nebula
       - nebula2