IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

reverted all trys to fix things within the script, use /bin/bash to spawn interpret the script

Browse Source
This commit is contained in:
Ulf Gebhardt 2022-01-12 16:22:54 +01:00
parent 940e3dd17d
commit f332bae932
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
2 changed files with 31 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/webhook/github.ts
View File

@ -19,8 +19,11 @@ export const githubWebhook = async (req: any, res: any): Promise<void> => {
if (payload.ref === `refs/heads/${CONFIG.WEBHOOK_GITHUB_BRANCH}`) { if (payload.ref === `refs/heads/${CONFIG.WEBHOOK_GITHUB_BRANCH}`) {
// spawn shell and detach process to allow killing of parent process in the update script // spawn shell and detach process to allow killing of parent process in the update script
const child = spawn( const child = spawn(
path.join(__dirname, '../../../deployment/bare_metal/start.sh'), '/bin/bash',
[CONFIG.WEBHOOK_GITHUB_BRANCH], [
path.join(__dirname, '../../../deployment/bare_metal/start.sh'),
CONFIG.WEBHOOK_GITHUB_BRANCH,
],
{ {
detached: true, detached: true,
stdio: ['ignore', 'ignore', 'ignore'], stdio: ['ignore', 'ignore', 'ignore'],

61
deployment/bare_metal/start.sh
View File

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