Merge branch 'master' into feature/context-menu

.gitlab-ci.yml

@@ -5,7 +5,7 @@ stages:          # List of stages for jobs, and their order of execution
 
 image: debian
 
-docker-build:
+docker-build-push:
   # Use the official docker image.
   image: docker:latest
   stage: build
@@ -30,6 +30,19 @@ docker-build:
     - master
     - dev
 
+docker-build:
+  image: docker:latest
+  stage: build
+  services:
+    - docker:dind
+  before_script:
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE" .
+  except:
+    - master
+    - dev
+
 before_script:
   - apt-get update -qq
   - apt-get install -qq git
@@ -41,7 +54,7 @@ before_script:
   - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
     
 deploy_staging:
-  type: deploy
+  stage: deploy
   script:
     - ssh $SSH_SERVER "cd /root && docker-compose up -d bot && exit"
   only: