rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-20 14:54:15 +01:00
Code Issues Releases Activity

Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev

Browse Source
This commit is contained in:
Du Peng 2022-05-23 17:02:24 +02:00
commit 37a0b3d8cd
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -4,6 +4,7 @@
- Disable to clicking outside or pressing escape to close sign up modal - Disable to clicking outside or pressing escape to close sign up modal
- Ability to disable colorize logging (#345) - Ability to disable colorize logging (#345)
- Detect assets compilation issue during the initial setup
- Fix a bug: when machines module disabled, Associated machines is still shown in trainings list - Fix a bug: when machines module disabled, Associated machines is still shown in trainings list
- Fix a bug: script mount-proof-of-identity-files unable to modify docker-compose.yml - Fix a bug: script mount-proof-of-identity-files unable to modify docker-compose.yml
- Fix a bug: Event reservation calendar encoding in mail - Fix a bug: Event reservation calendar encoding in mail

4
setup/setup.sh
View File

@ -380,7 +380,9 @@ setup_assets_and_databases()
cd "$FABMANAGER_PATH" && docker-compose run --rm -e ADMIN_EMAIL="$EMAIL" -e ADMIN_PASSWORD="$PASSWORD" "$SERVICE" bundle exec rake db:seed # seed the database cd "$FABMANAGER_PATH" && docker-compose run --rm -e ADMIN_EMAIL="$EMAIL" -e ADMIN_PASSWORD="$PASSWORD" "$SERVICE" bundle exec rake db:seed # seed the database
# now build the assets # now build the assets
cd "$FABMANAGER_PATH" && docker-compose run --rm "$SERVICE" bundle exec rake assets:precompile if ! docker-compose -f "$FABMANAGER_PATH/docker-compose.yml" run --rm "$SERVICE" bundle exec rake assets:precompile; then
echo -e "\e[91m[ ❌ ] someting went wrong while compiling the assets, exiting...\e[39m" && exit 1
fi
# and prepare elasticsearch # and prepare elasticsearch
cd "$FABMANAGER_PATH" && docker-compose run --rm "$SERVICE" bundle exec rake fablab:es:build_stats cd "$FABMANAGER_PATH" && docker-compose run --rm "$SERVICE" bundle exec rake fablab:es:build_stats