From d4e4d476e2b1d00d0a96f09cbe5be0001dc5d431 Mon Sep 17 00:00:00 2001 From: Yang Zhao Date: Mon, 31 Aug 2020 17:35:27 +0800 Subject: [PATCH 1/4] api depends on chain --- README.md | 27 +++++++------------------- generator/config-gen/api-config.gen.js | 1 + 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 756b780..9998ffd 100644 --- a/README.md +++ b/README.md @@ -17,35 +17,22 @@ Official crust node service for running crust protocol. ## Install dependencies -### Install lib +### Install crust service ```shell -sudo apt install -y git jq curl wget build-essential kmod -curl -fsSL https://get.docker.com | bash -s docker --mirror Aliyun -sudo apt install docker-compose -sudo apt install -y linux-headers-`uname -r` -``` - -### Install sgx driver -```shell -sudo ./scripts/install_sgx_driver.sh +sudo ./install.sh ``` ### Generate application configuration #### Modify config.yaml -You need to modify config.yaml - -### Run the config gen script -Run ```sudo ./scripts/gen_config.sh``` Configrations and docker compose will generated in the build directory. +```shell +sudo vim /opt/crust/crust-node/config.yaml +``` -### Run docker +### Run crust service ```shell -cd build -sudo docker-compose up crust -sudo docker-compose up crust-api -sudo docker-compose up crust-sworker -sudo docker-compose up karst # if your want to start karst, please make sure fastdfs is running in your computer +sudo systemctl start crust ``` ## License diff --git a/generator/config-gen/api-config.gen.js b/generator/config-gen/api-config.gen.js index 1f9e13a..5787478 100644 --- a/generator/config-gen/api-config.gen.js +++ b/generator/config-gen/api-config.gen.js @@ -21,6 +21,7 @@ async function genApiComposeConfig(config) { environment: { ARGS: args, }, + depends_on: crust, } } From e5ae315dba31fc0f03b1206527467cb72f27e808 Mon Sep 17 00:00:00 2001 From: Yang Zhao Date: Mon, 31 Aug 2020 18:23:26 +0800 Subject: [PATCH 2/4] fix error --- generator/config-gen/api-config.gen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator/config-gen/api-config.gen.js b/generator/config-gen/api-config.gen.js index 5787478..83ff6ad 100644 --- a/generator/config-gen/api-config.gen.js +++ b/generator/config-gen/api-config.gen.js @@ -21,7 +21,7 @@ async function genApiComposeConfig(config) { environment: { ARGS: args, }, - depends_on: crust, + depends_on: 'crust', } } From d69efeb7dbb03c2161532a60fb18949f61e9c9e1 Mon Sep 17 00:00:00 2001 From: Yang Zhao Date: Mon, 31 Aug 2020 18:29:30 +0800 Subject: [PATCH 3/4] fix depends on error --- generator/config-gen/api-config.gen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator/config-gen/api-config.gen.js b/generator/config-gen/api-config.gen.js index 83ff6ad..c9079a4 100644 --- a/generator/config-gen/api-config.gen.js +++ b/generator/config-gen/api-config.gen.js @@ -21,7 +21,7 @@ async function genApiComposeConfig(config) { environment: { ARGS: args, }, - depends_on: 'crust', + depends_on: ['crust'] } } From 906090d1caf694e7245bda0307eb7d7aa4b06f58 Mon Sep 17 00:00:00 2001 From: Yang Zhao Date: Mon, 31 Aug 2020 21:52:21 +0800 Subject: [PATCH 4/4] wait 15 s for chain --- scripts/crust.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/crust.sh b/scripts/crust.sh index ebbb9ef..89e582e 100755 --- a/scripts/crust.sh +++ b/scripts/crust.sh @@ -21,6 +21,8 @@ start() fi fi + docker-compose -f $builddir/docker-compose.yaml up -d crust + sleep 15 docker-compose -f $builddir/docker-compose.yaml up -d }