Merge pull request #40 from trestinlsd/develop

fix(docker-compose): fix bugs about docker-compose not starting cluster
imua-xyz · Apr 23, 2024 · c47a85f · c47a85f
2 parents 96a4964 + 8dda3d2
commit c47a85f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -482,7 +482,7 @@ localnet-build:
 # Generate multi node configuration files and initialize configurations
 # TODO: exocore testnet chainid is still under consideration and need to be finalized later
 localnet-init: localnet-stop
-	exocored testnet init-files --chain-id exocoretestnet_233-1 --v 4 -o  $(CURDIR)/build/.testnets --starting-ip-address 192.168.10.2 --keyring-backend=test  && \
+	exocored testnet init-files --chain-id exocoretestnet_233-1 --v 4 -o  $(CURDIR)/build/.testnets --starting-ip-address 192.168.0.2 --keyring-backend=os  && \
 	./networks/init-node.sh
 
 # Start a 4-node testnet locally

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -21,10 +21,10 @@ services:
       - "26661:26660"
       - "8841:8546"
     volumes:
-      - ./build/.testnets:/data:Z
+      - ./build/.testnets:/home/exocore/data:Z
     networks:
       localnet:
-        ipv4_address: 192.168.10.2
+        ipv4_address: 192.168.0.2
 
   exocorenode1:
     container_name: exocorenode1
@@ -46,10 +46,10 @@ services:
       - "26662:26660"
       - "8842:8546"
     volumes:
-      - ./build/.testnets:/data:Z
+      - ./build/.testnets:/home/exocore/data:Z
     networks:
       localnet:
-        ipv4_address: 192.168.10.3
+        ipv4_address: 192.168.0.3
 
   exocorenode2:
     container_name: exocorenode2
@@ -71,10 +71,10 @@ services:
       - "26663:26660"
       - "8843:8546"
     volumes:
-      - ./build/.testnets:/data:Z
+      - ./build/.testnets:/home/exocore/data:Z
     networks:
       localnet:
-        ipv4_address: 192.168.10.4
+        ipv4_address: 192.168.0.4
 
   exocorenode3:
     container_name: exocorenode3
@@ -96,15 +96,15 @@ services:
       - "26664:26660"
       - "8844:8546"
     volumes:
-      - ./build/.testnets:/data:Z
+      - ./build/.testnets:/home/exocore/data:Z
     networks:
       localnet:
-        ipv4_address: 192.168.10.5
+        ipv4_address: 192.168.0.5
 
 networks:
   localnet:
     driver: bridge
     ipam:
       driver: default
       config:
-        - subnet: 192.168.10.0/18
+        - subnet: 192.168.0.0/18
diff --git a/go.mod b/go.mod
@@ -36,7 +36,6 @@ require (
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
 	google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e
 	google.golang.org/grpc v1.57.1
-	google.golang.org/protobuf v1.33.0
 	gopkg.in/yaml.v2 v2.4.0
 	sigs.k8s.io/yaml v1.3.0
 )
@@ -214,6 +213,7 @@ require (
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

diff --git a/networks/local/exocore/wrapper.sh b/networks/local/exocore/wrapper.sh
@@ -12,7 +12,7 @@ if ! [ -f "${BINARY}" ]; then
 	exit 1
 fi
 
-export EHOME="/data/node${ID}/exocored"
+export EHOME="/home/exocore/data/node${ID}/exocored"
 export APP_TOML="$EHOME/config/app.toml"
 export CLIENT_TOML="$EHOME/config/client.toml"
 #APP_TOML_TMP="$EHOME/config/tmp_app.toml"