Merge branch 'master' into feature/context-menu

.gitlab-ci.yml

@@ -45,18 +45,17 @@ 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)
   - ssh-add <(echo "$SSH_PRIVATE_KEY")
   - mkdir -p ~/.ssh
   - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
-    
+  
 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