Merge branch 'develop'
This commit is contained in:
commit
ee7fb3b7b2
|
@ -8,16 +8,11 @@ magephp:
|
||||||
rsync: '-avz --delete'
|
rsync: '-avz --delete'
|
||||||
exclude:
|
exclude:
|
||||||
- "/.git"
|
- "/.git"
|
||||||
- "*.swp"
|
|
||||||
- "*.swo"
|
|
||||||
- "/.env.local"
|
- "/.env.local"
|
||||||
- "/data"
|
- "/migrations/"
|
||||||
- "/migrations/*"
|
|
||||||
- "/public/uploads/"
|
- "/public/uploads/"
|
||||||
- "/public/files/"
|
- "/public/files/"
|
||||||
- "/var/cache/*"
|
- "/var/"
|
||||||
- "/var/log/*"
|
|
||||||
- "/var/data.db"
|
|
||||||
- "/public/js/fos_js_routes.json"
|
- "/public/js/fos_js_routes.json"
|
||||||
- "/public/build"
|
- "/public/build"
|
||||||
- "/public/media"
|
- "/public/media"
|
||||||
|
|
|
@ -15,11 +15,10 @@ steps:
|
||||||
commands:
|
commands:
|
||||||
- cd "/builds/$CI_COMMIT_SHA"
|
- cd "/builds/$CI_COMMIT_SHA"
|
||||||
- mkdir "$HOME/.ssh"
|
- mkdir "$HOME/.ssh"
|
||||||
- echo "$SSH_PRIV_KEY" > "$HOME/.ssh/id_ed25519"
|
- echo "$SSH_PRIV_KEY" > "$HOME/.ssh/id_rsa"
|
||||||
- chmod 700 "$HOME/.ssh"
|
- chmod 700 "$HOME/.ssh"
|
||||||
- chmod 600 "$HOME/.ssh/id_ed25519"
|
- chmod 600 "$HOME/.ssh/id_rsa"
|
||||||
- cp .mage.yml.dist .mage.yml
|
- cp .mage.yml.dist .mage.yml
|
||||||
- sed -i "s/ssh_user/$SSH_USER/g" .mage.yml
|
- sed -i "s/ssh_user/$SSH_USER/g" .mage.yml
|
||||||
- sed -i "s/ssh_host/$SSH_HOST/g" .mage.yml
|
- sed -i "s/ssh_host/$SSH_HOST/g" .mage.yml
|
||||||
- sed -i "s#app_directory#$APP_DIRECTORY#g" .mage.yml
|
|
||||||
- mage deploy "$CI_PIPELINE_DEPLOY_TARGET"
|
- mage deploy "$CI_PIPELINE_DEPLOY_TARGET"
|
||||||
|
|
Loading…
Reference in a new issue