update scripts

init.sh

@@ -14,6 +14,11 @@ N=${1:-2}
 # cd ../
 
 
+cd  mainchain
+./scripts/stop-testnet.sh || true 
+cd ../
+
+
 ./ring.sh $N
 ./cadvisor.sh $N
 ./cryptor.sh  $N

mainchain/scripts/run-testnet.sh

@@ -20,7 +20,7 @@ if ${Join} ; then
     do
       idx=$(((($i-1))*10))
       echo $idx
-      docker run -d --name=node$i --net=cmpnet -e "ID=$i"  --ip=172.77.5.$i  -p $((26656+$idx)):26656 -p $((26657+$idx)):26657  -p $((1317+$idx)):1317 -p $((8545+$idx)):8545  -p $((8546+$idx)):8546   -v $MPWD/conf/deploy:/cmp   -it cmpd/node:latest  /usr/bin/start.sh
+      docker run -d --name=node$i --net=cmpnet -e "ID=$i"  --ip=172.77.5.$i  -p $((26656+$idx)):26656 -p $((26657+$idx)):26657  -p $((1317+$idx)):1317 -p $((8545+$idx)):8545  -p $((8546+$idx)):8546   -v $MPWD/conf/deploy:/cmp   -it 192.168.1.220:5000/cmpd/node:v0.0.1  /usr/bin/start.sh
 
     done
 
@@ -64,5 +64,5 @@ for i in $(seq 1 $N)
 do
   idx=$(((($i-1))*10))
   echo $idx
-  docker run -d --name=node$i --net=cmpnet -e "ID=$i" -e "ENABLE-CROSS-DOMAIN=true" -e "READ-TIMEOUT=60" -e "WRITE-TIMEOUNT=60"  --ip=172.77.5.$i  -p $((26656+$idx)):26656 -p $((26657+$idx)):26657  -p $((1317+$idx)):1317 -p $((8545+$idx)):8545  -p $((8546+$idx)):8546   -v $MPWD/conf/deploy:/cmp   -it cmpd/node:latest  /usr/bin/start.sh  
+  docker run -d --name=node$i --net=cmpnet -e "ID=$i" -e "ENABLE-CROSS-DOMAIN=true" -e "READ-TIMEOUT=60" -e "WRITE-TIMEOUNT=60"  --ip=172.77.5.$i  -p $((26656+$idx)):26656 -p $((26657+$idx)):26657  -p $((1317+$idx)):1317 -p $((8545+$idx)):8545  -p $((8546+$idx)):8546   -v $MPWD/conf/deploy:/cmp   -it 192.168.1.220:5000/cmpd/node:v0.0.1  /usr/bin/start.sh  
 done

mainchain/scripts/stop-testnet.sh

 #!/bin/bash
 
-docker ps  -f name=node  -aq | xargs docker rm -f
-docker network rm cmpnet
+set -e
+
+docker ps  -f name=node  -aq | xargs docker rm -f || true
+docker network rm cmpnet || true

stop.sh

@@ -4,8 +4,8 @@ set -e
 
 cd  mainchain
 ./scripts/stop-testnet.sh || true 
-rm -rf conf/deploy || true 
-cp -r  conf/back0712-1439  conf/deploy 
+# rm -rf conf/deploy || true 
+# cp -r  conf/back0712-1439  conf/deploy 
 
 cd ../