From 8d24fe1640089e09df87e96731cb17b6f86bcb01 Mon Sep 17 00:00:00 2001 From: Liam Lai Date: Thu, 27 Jan 2022 15:48:51 +0300 Subject: [PATCH] update docker compose filename and bootscrap command --- README.md | 17 ++++++++++++++--- ...er-compose-devnet.yml => docker-compose.yml} | 0 devnet/docker-down.sh | 2 +- devnet/docker-up.sh | 2 +- .../{docker-services.yml => docker-compose.yml} | 0 mainnet/docker-down.sh | 2 +- mainnet/docker-up.sh | 2 +- mainnet/upgrade.sh | 4 ++-- setup/bootstrap.sh | 15 ++++----------- setup/upgrade.sh | 4 ++-- .../{apothem-network.yml => docker-compose.yml} | 0 testnet/docker-down.sh | 2 +- testnet/docker-up.sh | 2 +- 13 files changed, 28 insertions(+), 24 deletions(-) rename devnet/{docker-compose-devnet.yml => docker-compose.yml} (100%) rename mainnet/{docker-services.yml => docker-compose.yml} (100%) rename testnet/{apothem-network.yml => docker-compose.yml} (100%) diff --git a/README.md b/README.md index 165ff64..5cf4422 100644 --- 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 b/devnet/docker-compose.yml similarity index 100% rename from devnet/docker-compose-devnet.yml rename to devnet/docker-compose.yml diff --git a/devnet/docker-down.sh b/devnet/docker-down.sh index b4f3070..c3ad03f 100755 --- 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 \ No newline at end of file +HOSTIP=$(curl https://checkip.amazonaws.com) docker-compose -f docker-compose.yml down \ No newline at end of file diff --git a/devnet/docker-up.sh b/devnet/docker-up.sh index 2bb6ce2..f688b41 100755 --- 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 \ No newline at end of file +HOSTIP=$(curl https://checkip.amazonaws.com) docker-compose -f docker-compose.yml up -d \ No newline at end of file diff --git a/mainnet/docker-services.yml b/mainnet/docker-compose.yml similarity index 100% rename from mainnet/docker-services.yml rename to mainnet/docker-compose.yml diff --git a/mainnet/docker-down.sh b/mainnet/docker-down.sh index d950b2f..c1afcc2 100755 --- a/mainnet/docker-down.sh +++ b/mainnet/docker-down.sh @@ -1 +1 @@ -sudo docker-compose -f docker-services.yml down \ No newline at end of file +sudo docker-compose -f docker-compose.yml down \ No newline at end of file diff --git a/mainnet/docker-up.sh b/mainnet/docker-up.sh index 570b71c..fa37025 100755 --- a/mainnet/docker-up.sh +++ b/mainnet/docker-up.sh @@ -1 +1 @@ -sudo docker-compose -f docker-services.yml up -d \ No newline at end of file +sudo docker-compose -f docker-compose.yml up -d \ No newline at end of file diff --git a/mainnet/upgrade.sh b/mainnet/upgrade.sh index 2965720..20ff08c 100755 --- 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 index 4504202..c4875fe 100755 --- 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 index 2965720..20ff08c 100755 --- 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 b/testnet/docker-compose.yml similarity index 100% rename from testnet/apothem-network.yml rename to testnet/docker-compose.yml diff --git a/testnet/docker-down.sh b/testnet/docker-down.sh index d950b2f..c1afcc2 100755 --- a/testnet/docker-down.sh +++ b/testnet/docker-down.sh @@ -1 +1 @@ -sudo docker-compose -f docker-services.yml down \ No newline at end of file +sudo docker-compose -f docker-compose.yml down \ No newline at end of file diff --git a/testnet/docker-up.sh b/testnet/docker-up.sh index 570b71c..fa37025 100755 --- a/testnet/docker-up.sh +++ b/testnet/docker-up.sh @@ -1 +1 @@ -sudo docker-compose -f docker-services.yml up -d \ No newline at end of file +sudo docker-compose -f docker-compose.yml up -d \ No newline at end of file