From a2057da863011e739a11873dc499084fc9df99b2 Mon Sep 17 00:00:00 2001
From: Aaron Riedel <git@ar21.de>
Date: Sun, 6 Mar 2022 10:42:50 +0000
Subject: [PATCH 1/2] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14156eb..6a29363 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,7 +41,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:

From bbbe2aeaa4c04348d840ccef10bb8c13ae932e19 Mon Sep 17 00:00:00 2001
From: Aaron Riedel <git@ar21.de>
Date: Sun, 6 Mar 2022 11:02:30 +0000
Subject: [PATCH 2/2] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a29363..6b16fac 100644
--- a/.gitlab-ci.yml
+++ b/.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