update docker compose filename and bootscrap command

XinFinOrg · Jan 27, 2022 · 8d24fe1 · 8d24fe1
1 parent 7be9de6
commit 8d24fe1
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -68,10 +68,12 @@ https://user-images.githubusercontent.com/92325549/137086528-4a8c5c44-ce89-4a70-
 
 ### Method 2 :- Setup XinFin Masternode Bootstrap Script ###
 
+**For Mainnet**
+
 Bootstrap Command XinFin Node Setup:- 
 
 ```
-sudo su -c "bash <(wget -qO- https://raw.githubusercontent.com/XinFinOrg/XinFin-Node/master/setup/bootstrap.sh)" root
+sudo su -c "bash <(wget -qO- https://raw.githubusercontent.com/XinFinOrg/XinFin-Node/master/setup/bootstrap.sh) mainnet" root
 ```
 
 Examples:- 
@@ -84,6 +86,15 @@ Your Masternode Name is Demo_Server
 ```
 
 
+**For Testnet**
+```
+sudo su -c "bash <(wget -qO- https://raw.githubusercontent.com/XinFinOrg/XinFin-Node/master/setup/bootstrap.sh) testnet" root
+```
+
+**For Devnet**
+```
+sudo su -c "bash <(wget -qO- https://raw.githubusercontent.com/XinFinOrg/XinFin-Node/master/setup/bootstrap.sh) devnet" root
+```
 
 ---------------------------------
 
@@ -131,7 +142,7 @@ nano .env
 Run:
 ```
 cd mainnet
-sudo docker-compose -f docker-services.yml up -d
+sudo docker-compose -f docker-compose.yml up -d
 ```
 
 You should be able to see your node listed on the [XinFin Network](https://XinFin.network/) page.
@@ -141,7 +152,7 @@ Your coinbase address can be found in xdcchain/coinbase.txt file.
 
 To stop the node or if you encounter any issues use:
 ```
-sudo docker-compose -f docker-services.yml down
+sudo docker-compose -f docker-compose.yml down
 ```
 Attach XDC Console:
 ```

diff --git a/devnet/docker-compose-devnet.yml → devnet/docker-compose.yml b/devnet/docker-compose-devnet.yml → devnet/docker-compose.yml
diff --git a/devnet/docker-down.sh b/devnet/docker-down.sh
@@ -1 +1 @@
-HOSTIP=$(curl https://checkip.amazonaws.com)  docker-compose -f docker-compose-devnet.yml down
+HOSTIP=$(curl https://checkip.amazonaws.com)  docker-compose -f docker-compose.yml down
diff --git a/devnet/docker-up.sh b/devnet/docker-up.sh
@@ -1 +1 @@
-HOSTIP=$(curl https://checkip.amazonaws.com)  docker-compose -f docker-compose-devnet.yml up -d
+HOSTIP=$(curl https://checkip.amazonaws.com)  docker-compose -f docker-compose.yml up -d
diff --git a/mainnet/docker-services.yml → mainnet/docker-compose.yml b/mainnet/docker-services.yml → mainnet/docker-compose.yml
diff --git a/mainnet/docker-down.sh b/mainnet/docker-down.sh
@@ -1 +1 @@
-sudo docker-compose -f docker-services.yml down
+sudo docker-compose -f docker-compose.yml down
diff --git a/mainnet/docker-up.sh b/mainnet/docker-up.sh
@@ -1 +1 @@
-sudo docker-compose -f docker-services.yml up -d
+sudo docker-compose -f docker-compose.yml up -d
diff --git a/mainnet/upgrade.sh b/mainnet/upgrade.sh
@@ -4,7 +4,7 @@ echo "Upgrading XinFin Network Configuration Scripts"
 git pull
 echo "Upgrading Docker Images"
 sudo docker pull xinfinorg/xinfinnetwork:1.4.4
-sudo docker-compose -f docker-services.yml down
+sudo docker-compose -f docker-compose.yml down
 git pull
-sudo docker-compose -f docker-services.yml up -d
+sudo docker-compose -f docker-compose.yml up -d
 
diff --git a/setup/bootstrap.sh b/setup/bootstrap.sh
@@ -18,7 +18,7 @@ function configureXinFinNode(){
 
     echo "Clone Xinfin Node"
 
-    git clone https://github.com/hash-laboratories-au/XinFin-Node && cd XinFin-Node/mainnet
+    git clone https://github.com/hash-laboratories-au/XinFin-Node && cd XinFin-Node/$1
     sed -i "s/INSTANCE_NAME=XF_MasterNode/INSTANCE_NAME=${MasterNodeName}_XF/g" .env
 
 
@@ -44,22 +44,15 @@ function configureXinFinNode(){
     sleep 5
     echo "Docker Compose Installed successfully"
 
-    sudo docker-compose -f docker-services.yml up -d
-
+    sudo docker-compose -f docker-compose.yml up -d
 
 }
 
-function init(){
-
-        configureXinFinNode
-}
-
-
 function main(){
 
-    init
+    configureXinFinNode $1
 
 }
 
-main
+main $1
 
diff --git a/setup/upgrade.sh b/setup/upgrade.sh
@@ -4,7 +4,7 @@ echo "Upgrading XinFin Network Configuration Scripts"
 git pull
 echo "Upgrading Docker Images"
 sudo docker pull xinfinorg/xinfinnetwork:1.4.4
-sudo docker-compose -f docker-services.yml down
+sudo docker-compose -f docker-compose.yml down
 git pull
-sudo docker-compose -f docker-services.yml up -d
+sudo docker-compose -f docker-compose.yml up -d
 
diff --git a/testnet/apothem-network.yml → testnet/docker-compose.yml b/testnet/apothem-network.yml → testnet/docker-compose.yml
diff --git a/testnet/docker-down.sh b/testnet/docker-down.sh
@@ -1 +1 @@
-sudo docker-compose -f docker-services.yml down
+sudo docker-compose -f docker-compose.yml down
diff --git a/testnet/docker-up.sh b/testnet/docker-up.sh
@@ -1 +1 @@
-sudo docker-compose -f docker-services.yml up -d
+sudo docker-compose -f docker-compose.yml up -d