Merge branch 'feature/stats' of https://github.com/monarc-project/MonarcAppFO into feature/stats

* 'feature/stats' of https://github.com/monarc-project/MonarcAppFO:
  chg: [vagrant] forward default output of systemd to /dev/null
  chg: [stats service deployment] do not install dev dependencies.
  added FLASK_APP env variable

# Conflicts:
#	vagrant/bootstrap.sh
pull/316/head
Ruslan Baidan 2020-07-08 09:42:49 +02:00
parent c998326768
commit 84d6104001
No known key found for this signature in database
GPG Key ID: 4B7724C136BF1D89
2 changed files with 26 additions and 19 deletions

View File

@ -6,24 +6,27 @@ NC='\033[0m' # No Color
bypass=0
forceClearCache=0
while getopts "hbc" option
isDevEnv=0
while getopts "hbcd" option
do
case $option in
h)
echo -e "Update or install all Monarc modules, frontend views and migrate database."
echo -e "\t-b\tbypass migrate database"
echo -e "\t-c\tforce clear cache"
echo -e "\t-h\tdisplay this message"
exit 1
;;
b)
bypass=1
echo "Migrate database don't execute !!!"
;;
c)
forceClearCache=1
;;
esac
case $option in
h)
echo -e "Update or install all Monarc modules, frontend views and migrate database."
echo -e "\t-b\tbypass migrate database"
echo -e "\t-c\tforce clear cache"
echo -e "\t-h\tdisplay this message"
exit 1
;;
b)
bypass=1
echo "Migrate database don't execute !!!"
;;
c)
forceClearCache=1
;;
d)
isDevEnv=1
esac
done
pull_if_exists() {
@ -57,7 +60,11 @@ if [[ $? -eq 1 ]]; then
exit 1
fi
composer install -o --no-dev
if [[ $isDevEnv -eq 0 ]]; then
composer ins -o --no-dev
else
composer ins
fi
pathCore="module/Monarc/Core"
pathFO="module/Monarc/FrontOffice"

View File

@ -278,7 +278,7 @@ sudo usermod -aG vagrant www-data
echo -e "\n--- Update the project… ---\n"
sudo chown -R $USER:$(id -gn $USER) /home/vagrant/.config
./scripts/update-all.sh > /dev/null
./scripts/update-all.sh -d > /dev/null