try && as connection

This commit is contained in:
Ulf Gebhardt 2022-01-12 16:02:16 +01:00
parent c9b4a5257b
commit 02f519ae9b
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9

View File

@ -50,15 +50,11 @@ pm2 stop gradido-admin
# git
BRANCH=${1:-master}
echo "Starting with git pull - branch:$BRANCH<br>" >> $UPDATE_HTML
update_git(){
cd $PROJECT_ROOT
git fetch origin $BRANCH
git checkout $BRANCH
git pull
export BUILD_COMMIT="$(git rev-parse HEAD)"
}
update_git
cd $PROJECT_ROOT && \
git fetch origin $BRANCH && \
git checkout $BRANCH && \
git pull && \
export BUILD_COMMIT="$(git rev-parse HEAD)"
# Generate gradido.conf from template
echo 'Generate new gradido nginx config<br>' >> $UPDATE_HTML
@ -78,55 +74,43 @@ envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $NGINX_CONFIG_DIR/$TEMPLATE
# Install & build database
echo 'Updating database<br>' >> $UPDATE_HTML
update_database(){
cd $PROJECT_ROOT/database
yarn install
yarn build
if [ "$DEPLOY_SEED_DATA" = "true" ]; then
yarn dev_up
yarn dev_reset
yarn seed
else
yarn up
fi
}
update_database
#cd $PROJECT_ROOT/database
#yarn install
#yarn build
#if [ "$DEPLOY_SEED_DATA" = "true" ]; then
# yarn dev_up
# yarn dev_reset
# yarn seed
#else
# yarn up
#fi
# Install & build backend
echo 'Updating backend<br>' >> $UPDATE_HTML
update_backend() {
cd $PROJECT_ROOT/backend
yarn install
yarn build
pm2 delete gradido-backend
pm2 start --name gradido-backend "yarn start" --no-treekill
pm2 save
}
update_backend
cd $PROJECT_ROOT/backend && \
yarn install && \
yarn build && \
pm2 delete gradido-backend && \
pm2 start --name gradido-backend "yarn start" --no-treekill && \
pm2 save
# Install & build frontend
echo 'Updating frontend<br>' >> $UPDATE_HTML
update_frontend() {
cd $PROJECT_ROOT/frontend &&
yarn install
yarn build
pm2 delete gradido-frontend
pm2 start --name gradido-frontend "yarn start"
pm2 save
}
update_frontend
cd $PROJECT_ROOT/frontend && \
yarn install && \
yarn build && \
pm2 delete gradido-frontend && \
pm2 start --name gradido-frontend "yarn start" && \
pm2 save
# Install & build admin
echo 'Updating admin<br>' >> $UPDATE_HTML
update_admin() {
cd $PROJECT_ROOT/admin
yarn install
yarn build
pm2 delete gradido-admin
pm2 start --name gradido-admin "yarn start"
pm2 save
}
update_admin
cd $PROJECT_ROOT/admin && \
yarn install && \
yarn build && \
pm2 delete gradido-admin && \
pm2 start --name gradido-admin "yarn start" && \
pm2 save
# let nginx showing gradido
echo 'Configuring nginx to serve gradido again<br>' >> $UPDATE_HTML