diff --git a/.deploy_code_to_server.yml b/.deploy_code_to_server.yml index 7f38e52e05a5cb0317906d65d2580533405d0453..523d09707c449a3c7dfbb03518551acd6b0826a4 100644 --- a/.deploy_code_to_server.yml +++ b/.deploy_code_to_server.yml @@ -20,12 +20,13 @@ echo $PROJECT_FILTER .deploy_code_to_server_with_delete: + variables: + RSYNC_PARAMS: "--delete --dry-run" extends: .before_deploy_code script: - 'which curl || (apt-get update -y && apt-get install curl -y)' - curl -O https://gitlab.cetera.ru/boilerplate/ci/raw/ci-delete/rsync-filter-std - *set_rsync_filter - - export RSYNC_PARAMS="--delete --dry-run" - rsync -avz --chown=33:33 --numeric-ids -e "ssh -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i $HOME/.ssh/deploy.key " --filter="merge rsync-filter-std" --filter="merge $PROJECT_FILTER" $RSYNC_PARAMS $CI_PROJECT_DIR/ root@${!PROJECT_SERVER}::www/${!PROJECT_SITE}/ only: refs: diff --git a/gitlab-ci-template.yml b/gitlab-ci-template.yml index 30f59127ecc3eec8e9ddd977c58bcd9316ce4c81..5124346e88ecb54772d96b04a76b1e77a0454df9 100644 --- a/gitlab-ci-template.yml +++ b/gitlab-ci-template.yml @@ -7,17 +7,20 @@ include: - 'https://gitlab.cetera.ru/boilerplate/ci/raw/master/.deploy_code_to_server.yml' - 'https://gitlab.cetera.ru/boilerplate/ci/raw/master/.deploy_composer_files_to_server.yml' -.build_assets: +build_assets: extends: .build_assets -.build_composer: +build_composer: extends: .build_composer -.deploy_assets_to_staging: +deploy_assets_to_staging: extends: .deploy_assets_to_staging -.deploy_code_to_server: +deploy_code_to_server: extends: .deploy_code_to_server + +deploy_code_to_server_with_delete: + extends: .deploy_code_to_server_with_delete -.deploy_composer_files_to_server: +deploy_composer_files_to_server: extends: .deploy_composer_files_to_server