diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 852e7ed..98464a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,11 +21,7 @@ build_stage: - .output/ - .nuxt/ - # restrict to specific branch -# only: -# - master - -# define the deploy stage +# define the deploy stages deploy_staging: stage: deploy resource_group: staging @@ -35,24 +31,15 @@ deploy_staging: name: staging url: https://next.rockfic.com image: ubuntu:latest - # - apt-get update && apt-get install --yes --no-install-recommends rsync git openssh-client curl sshpass - # - eval $(ssh-agent -s) - # - chmod 600 ${SSH_DEPLOY_KEY} - # - ssh-add ${SSH_DEPLOY_KEY} - # - mkdir -p ~/.ssh - # - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' before_script: - ". ${CI_PROJECT_DIR}/.more-ci/deploy-pre.sh ${SSH_DEPLOY_KEY}" script: - # - "cat ${ENV_FILE} | ssh rockfic@${DEPLOY_SERVER} 'cat > ~/rockfic-staging/.env'" - rsync --archive --del ${CI_PROJECT_DIR}/ rockfic@${DEPLOY_SERVER}:~/rockfic-staging/ - scp ${ENV_FILE} rockfic@${DEPLOY_SERVER}:rockfic-staging/.env - #- rsync --archive --delete ${CI_PROJECT_DIR}/cnf/ ${DEPLOY_USER}@${DEPLOY_SERVER}:~/cnf/ - - # restart Node.js and reload nginx configuration - sshpass -p "${OLDROOTPWD}" ssh root@rockfic.com '~/cp.sh' - ssh rockfic@${DEPLOY_SERVER} "~/stage.sh" ${DB_NAME} - - ssh rockfic@${DEPLOY_SERVER} node "~/rockfic-staging/.output/server/index.mjs" \&\>/dev/null \& disown \%1 + # restart Node.js and reload nginx configuration + - ssh rockfic@${DEPLOY_SERVER} 'node "~/rockfic-staging/.output/server/index.mjs" &>/dev/null & disown %1' - ssh rockfic@${DEPLOY_SERVER} sudo systemctl reload apache2 except: - tags @@ -70,9 +57,8 @@ deploy_production: script: - rsync --archive --del ${CI_PROJECT_DIR}/ root@${DEPLOY_SERVER}:/home/@rockfic/ - scp ${ENV_FILE} root@${DEPLOY_SERVER}:/home/@rockfic/.env - #- rsync --archive --delete ${CI_PROJECT_DIR}/cnf/ ${DEPLOY_USER}@${DEPLOY_SERVER}:~/cnf/ - sed -Ei "s,(hasMigrated = )false,\1true," /home/@rockfic/lib/dbconfig.ts - - ssh root@${DEPLOY_SERVER} node "/home/@rockfic/.output/server/index.mjs" \&\>/dev/null \& disown \%1 + - ssh root@${DEPLOY_SERVER} 'node "/home/@rockfic/.output/server/index.mjs" &>/dev/null & disown %1' - ssh root@${DEPLOY_SERVER} sudo systemctl reload apache2 only: - tags