Merge branch 'master' into feature/context-menu
This commit is contained in:
commit
efc4cd0d49
1 changed files with 2 additions and 3 deletions
|
@ -45,7 +45,6 @@ docker-build:
|
|||
|
||||
before_script:
|
||||
- apt-get update -qq
|
||||
- apt-get install -qq git
|
||||
# Setup SSH deploy keys
|
||||
- 'which ssh-agent || ( apt-get install -qq openssh-client )'
|
||||
- eval $(ssh-agent -s)
|
||||
|
@ -56,7 +55,7 @@ before_script:
|
|||
deploy_staging:
|
||||
stage: deploy
|
||||
script:
|
||||
- ssh $SSH_SERVER "cd /root && docker-compose up -d bot && exit"
|
||||
- ssh $SSH_SERVER "cd /root && docker-compose pull shbot && docker-compose up -d shbot && exit"
|
||||
only:
|
||||
- master
|
||||
|
Loading…
Add table
Reference in a new issue