From cfa60b532e5fbb7e6d4a0245dd711925ffc91b79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Mart=C3=ADnez?= Date: Fri, 29 Mar 2024 10:36:26 +0100 Subject: [PATCH] yarn installation and docs clarification --- docs/InstructionsForDevelopers.md | 4 +++- scripts/develop_academy.sh | 10 +++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docs/InstructionsForDevelopers.md b/docs/InstructionsForDevelopers.md index 199c54fa5..935591328 100644 --- a/docs/InstructionsForDevelopers.md +++ b/docs/InstructionsForDevelopers.md @@ -38,7 +38,9 @@ You may access RA frontend at [http://127.0.0.1:7164/exercises/](http://127.0.0. 3) Developing procedure -After running the script, the src folder will be created, which contains all the files of the RoboticsApplicationManager. You can create branches and commit normally to the RAM repo from inside that folder. For the rest of the changes, you can also work normally from the RoboticsAcademy folder, the contents of the src folder together with common boilerplate files are automatically ignored. +After running the script, the src folder will be created, which contains all the files of the RoboticsApplicationManager. You can create branches and commit normally to the RAM repo from inside that folder. For the rest of the changes, you can also work normally from the RoboticsAcademy folder, the contents of the src folder together with common boilerplate files are automatically ignored. + +Whenever you want to finish developing, you just can close the script with Crtl+C. It will take care of cleaning files so you can restart again without any additional config. ### Using Docker compose diff --git a/scripts/develop_academy.sh b/scripts/develop_academy.sh index a9c42bcec..6ca6784b7 100644 --- a/scripts/develop_academy.sh +++ b/scripts/develop_academy.sh @@ -39,6 +39,11 @@ if ! command -v nvm &> /dev/null; then source $NVM_DIR/nvm.sh; fi +# Prepare yarn +if ! command -v yarn --version &> /dev/null; then + npm install --global yarn +fi + # Prepare the frontend nvm install 16 nvm use 16 @@ -54,8 +59,7 @@ if [ $radi_version != "humble" ]; then fi cp compose_cfg/$compose_file docker-compose.yaml - # Proceed with docker-compose commands -docker-compose up; -docker-compose down; +docker compose up; +docker compose down; rm docker-compose.yaml