From 5a4191e63685afd9793fb295e6e44d5c5ff9d578 Mon Sep 17 00:00:00 2001 From: Swati Rawal Date: Tue, 2 Jul 2024 10:41:48 +0100 Subject: [PATCH 1/2] chore: added the fix --- src/boilerplate/common/bin/startup | 6 ++++++ src/boilerplate/common/boilerplate-package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/boilerplate/common/bin/startup b/src/boilerplate/common/bin/startup index 999e1af10..50736ddca 100644 --- a/src/boilerplate/common/bin/startup +++ b/src/boilerplate/common/bin/startup @@ -21,3 +21,9 @@ docker-compose -f docker-compose.zapp.yml up -d timber sleep 10 docker-compose -f docker-compose.zapp.yml up -d zapp + +echo "All services have been started." +echo "----------------------------------------------------" +echo " Run these commands in the terminal to get the logs" +echo "docker compose -f docker-compose.zapp-double.yml logs -f -n 1000 zapp zokrates timber" +echo "-----------------------------------------------------" diff --git a/src/boilerplate/common/boilerplate-package.json b/src/boilerplate/common/boilerplate-package.json index 12243176c..764e99888 100644 --- a/src/boilerplate/common/boilerplate-package.json +++ b/src/boilerplate/common/boilerplate-package.json @@ -5,7 +5,7 @@ "test": "./bin/startup && docker-compose -f docker-compose.zapp.yml run zapp npx mocha --exit --require @babel/register 'orchestration/test.mjs'", "retest": "docker-compose -f docker-compose.zapp.yml run zapp npx mocha --exit --require @babel/register 'orchestration/test.mjs'", "start": "./bin/startup", - "restart": "docker rm apiservice && docker-compose -f docker-compose.zapp.yml run --name apiservice -p 3000:3000 zapp node orchestration/api.mjs", + "restart": "docker-compose -f docker-compose.zapp.yml run --name apiservice -p 3000:3000 zapp node orchestration/api.mjs", "apitest": "./bin/setup && ./bin/startup && docker-compose -f docker-compose.zapp.yml run --name apiservice -d -p 3000:3000 zapp node orchestration/api.mjs" }, "keywords": [ From 2abd62ad3e144f7e784e2beeddec61571a177746 Mon Sep 17 00:00:00 2001 From: Swati Rawal Date: Tue, 2 Jul 2024 11:04:40 +0100 Subject: [PATCH 2/2] fix: fixed the restart command --- src/boilerplate/common/boilerplate-package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/boilerplate/common/boilerplate-package.json b/src/boilerplate/common/boilerplate-package.json index 764e99888..5166f1b35 100644 --- a/src/boilerplate/common/boilerplate-package.json +++ b/src/boilerplate/common/boilerplate-package.json @@ -5,7 +5,7 @@ "test": "./bin/startup && docker-compose -f docker-compose.zapp.yml run zapp npx mocha --exit --require @babel/register 'orchestration/test.mjs'", "retest": "docker-compose -f docker-compose.zapp.yml run zapp npx mocha --exit --require @babel/register 'orchestration/test.mjs'", "start": "./bin/startup", - "restart": "docker-compose -f docker-compose.zapp.yml run --name apiservice -p 3000:3000 zapp node orchestration/api.mjs", + "restart": "docker-compose -f docker-compose.zapp.yml restart && docker compose -f docker-compose.zapp-double.yml logs -f -n 1000 zapp zokrates timber", "apitest": "./bin/setup && ./bin/startup && docker-compose -f docker-compose.zapp.yml run --name apiservice -d -p 3000:3000 zapp node orchestration/api.mjs" }, "keywords": [