From 535af64d1a29f79fb64c705a467af0fbf799ddd0 Mon Sep 17 00:00:00 2001
From: Wolfgang Ludger Hottgenroth <w.hottgenroth@krohne.com>
Date: Tue, 11 Jan 2022 11:03:59 +0100
Subject: [PATCH] refactor ci script

---
 .gitlab-ci.yml | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ac36de..38b74d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,25 @@
 stages:
-    - check
     - build
     - deploy
 
-include:
-    - project: dockerized/commons
-      ref: master
-      file: gitlab-ci-template.yml
+variables:
+        IMAGE_NAME: $CI_REGISTRY/$CI_PROJECT_PATH
 
+build:
+    image: registry.hottis.de/dockerized/docker-bash:latest
+    stage: build
+    tags:
+        - hottis
+        - linux
+        - docker
+    script: 
+        - docker build --tag $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} .
+        - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY;
+        - docker push $IMAGE_NAME:${CI_COMMIT_SHORT_SHA}
+        - if [ "$CI_COMMIT_TAG" != "" ]; then
+            docker tag $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} $IMAGE_NAME:${CI_COMMIT_TAG};
+            docker push $IMAGE_NAME:${CI_COMMIT_TAG};
+          fi
 deploy:
     image: registry.hottis.de/dockerized/docker-bash:latest
     stage: deploy